timer fix
trivia
Merge branch 'master' into brumdebug

Conflicts:
	experiment1.R