deleted files
added master branch + style.css
little layout form+timer
Timer fix and user can only answer once
Added a filter page for answers
Merge branch 'groep7' of github.com:v1kko/SWE_2013_Groep2 into groep7
Merge branch 'master' into groep7

Conflicts:
	README.md
	controllers/answer.py
	dbconnection.py
	flaskapplication.py
	lti.py
	models/answer.py
	models/base.py
	models/question.py
	templates/index.html
	templates/showanswers.html
Fixed answer form and db shit
updated shit and added remove by id
Timer fix and user can only answer once
Fixed conflicts
Fixed aerror
Edited controller so everything works
Merge branch 'master' into groep7

Conflicts:
	controllers/answer.py
	models/answer.py
	models/base.py
Fixed ugly doslike ^M at end of line etc
everything is now (almost) conform pep8

Also did some renaming in the models for less confusion
added change from laurensv
corrected templates/index.html
Merge remote-tracking branch 'vikko/master'

Conflicts:
	models/answer.py
	models/basemodel.py
	models/question.py
	templates/index.html
Fixed some b stuff