work on question page
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/questions.html