Changes the User class.
Merge branch 'master' of github.com:Assios/fellesprosjekt

Conflicts:
	bin/modelPakke/User.class
	src/DBconnection/KalenderSystemDB.java
Merge branch 'master' of github.com:Assios/fellesprosjekt