Minor refactoring.
Merge branch 'master' of https://github.com/axelb/clicker

Conflicts:
	routes/question.js