some changes to answer.py and related
Merge branch 'master' of https://github.com/matthijsbos/SWE_2013_Groep2
Merge branch 'master' of https://github.com/matthijsbos/SWE_2013_Groep2
Rewrote question answer form
Merge branch 'master' of https://github.com/matthijsbos/SWE_2013_Groep2

Conflicts:
	controllers/answerchoice.py
made question appear in answer choice lobby
Merge branch 'master' of https://github.com/matthijsbos/SWE_2013_Groep2

Conflicts:
	controllers/answerchoice.py