removed print statements and unused code
Merge branch 'master' of https://github.com/koenk/software-engineering-team6
made some classes private and added exception throwing
Merge branch 'master' of github.com:koenk/software-engineering-team6
Merge branch 'master' of github.com:v1kko/SWE_2013_Groep2
Add escape markup javascript function
Fix XSS injection in student.js
Merge branch 'master' of github.com:v1kko/SWE_2013_Groep2
Fix merge conflict with fucking windows line endings
unix eol.........
Last unix shit
Fix double escaping in question list
Fix merge error with windows linenendings.... again.....
Fix more XSS injection shit
merge with groep7
Merge branch 'groep7' of https://github.com/v1kko/SWE_2013_Groep2 into groep7