Merge adding question with question list
Merge branch 'master' of github.com:koenk/software-engineering-team6

Conflicts:
	templates/question_list.html