user.js is klaar!

password encryptie doen we in de client
blaat
Merge branch 'master' of https://github.com/legopiraat/MD-RIA-Agenda

Conflicts:
	server/server.js