untested add user method
untested add user method
insert/view merge/fix and commentz
Merge branch 'master' of git@github.com:utwente-di/di20.git into dev

Conflicts:
	src/main/resources/Database.java
Merge branch 'dev' of https://github.com/utwente-di/di20 into dev
Merge branch 'master' of git@github.com:utwente-di/di20.git into dev
Merge branch 'master' into dev
Merge branch 'dev' of git@github.com:utwente-di/di20.git into dev

Conflicts:
	src/main/resources/Database.java
added database test
fix the test, ironically
boolean inserts
cleanup database, databasetest
MVC opzet, dwz logica in servlets en dan redirect naar jsp