Test to commit to branch 'search'
random spul
Merge branch 'search' of github.com:utwente-di/di10 into search
hoe.jsp implemented, unused header.jsp deleted
registreer toegevoegd
collectie spul
Merge branch 'login' of github.com:utwente-di/di10
Merge branch 'master' of github.com:utwente-di/di10 into login
Merge branch 'master' of github.com:utwente-di/di10 into search
DBTest added
Merge branch 'database' of github.com:utwente-di/di10 into login
removed db.java
gitignore
merge conflicts
Login
searchBrowseStuff
search started
Martinus Filipus zijn shit
stuff?
changed artworkbean