stop editing while i'm editing
Merge branch 'master' of https://github.com/WebTechGroup5/Project

Conflicts:
	question_view.php