Delete question controller
Merge branch 'master' of github.com:koenk/software-engineering-team6

Conflicts:
	flaskapplication.py