derp
Merge branch 'master' of https://github.com/matthijsbos/SWE_2013_Groep2
er zijn minieme aanpassingen als het goed is
Merge branch 'master' of github.com:matthijsbos/SWE_2013_Groep2
Merge branch 'master' of https://github.com/matthijsbos/SWE_2013_Groep2
ranking fix
Merge branch 'master' of github.com:matthijsbos/SWE_2013_Groep2
ranking is nu gefixed en werkt
trust.py toegevoegd
merge fix
changed newline from win to unix
Merge branch 'groep7' of https://github.com/v1kko/SWE_2013_Groep2 into merger
Merge branch 'master' of https://github.com/matthijsbos/SWE_2013_Groep2 into merger

Conflicts:
	controllers/answer.py
Merge branch 'master' of https://github.com/v1kko/SWE_2013_Groep2 into merger
added rate button to student_index
added button for ranking to student index
Merge branch 'groep7' of https://github.com/v1kko/SWE_2013_Groep2 into merger
Merge branch 'master' of https://github.com/v1kko/SWE_2013_Groep2 into merger

Conflicts:
	models/answer.py
	static/css/style.css
	templates/question_list_tbl.html
bla
added rate it button to student answer page