remove old merge conflict (??) stuff
remove old merge conflict (??) stuff

wolfgangwalther/jsPsych,jspsych/jsPsych,jspsych/jsPsych,jspsych/jsPsych,jspsych/jsPsych,wolfgangwalther/jsPsych,jodeleeuw/jsPsych