user.py is sowieso verneukt
Merge branch 'master' of github.com:matthijsbos/SWE_2013_Groep2
foutje eruit gehaald