...
Merge branch 'master' of https://github.com/trosne/progU48

Conflicts:
	CalendarSystem/src/tdt4140/calendarsystem/UserManager.java