BLABALBLALA
balbalba
Merge remote-tracking branch 'vikko/master'
FIxed some bugs
commit
fixed more db stuff
removed Base from base.py
Merge remote-tracking branch 'vikko/master'

Conflicts:
	models/answer.py
	models/basemodel.py
	models/question.py
	templates/index.html
Fixed some b stuff
Changes related to storing of answer choices
- Added saveanswerchoice controller
- Added route
- Changes to answerchoice table
Commit choice en style
Merge branch 'master' of https://github.com/matthijsbos/SWE_2013_Groep2
Put answerchoice process method in answerchoice.py
Merge branch 'master' of https://github.com/matthijsbos/SWE_2013_Groep2
fixed some of the errors caused by me
Some changes
some bugfixes
Merge branch 'master' of https://github.com/matthijsbos/SWE_2013_Groep2

Conflicts:
	flaskapplication.py
Fixed writer for answer choice
fixed some stuff