bugfix
name for experiment
js timer
trivia
placeholder for your name
trivia
Merge branch 'master' into brumdebug

Conflicts:
	experiment1.R