Made changes for treatment five
Merge branch 'treatment_five'

Conflicts:
	.gitignore
	app/mockserver.coffee
	app/views/homepage.eco
	app/views/lobby.eco
	app/views/quiz.eco
	app/views/task.eco
	app/views/tutorial.eco

Worked on the code for treatment five on a separate branch.
Merging in the changes