Merge branch 'master' of https://github.com/WebTechGroup5/Project

Conflicts:
	answer_action.php
nothing
Merge branch 'master' of https://github.com/WebTechGroup5/Project

Conflicts:
	answer_action.php