Stroop Effect Experiment
Merge branch 'master' of https://github.com/InfinitiRb/hip-1

Conflicts:
	app/models/stroopEffect/TimeLog.java
	app/views/home.scala.html
	app/views/stroopEffect/info.scala.html
	app/views/stroopEffect/proc.scala.html
	conf/routes