Merge branch 'login' of github.com:utwente-di/di10
Merge branch 'search' of github.com:utwente-di/di10
Collectie nog stuk
added password hashing and salt generation
Merge branch 'login' of github.com:utwente-di/di10 into login
this time, i really fixed contact
Merge branch 'search' of github.com:utwente-di/di10 into search
merge