kdskf
mail
Merge branch 'master' of https://github.com/imaltont/PsychicWookie.git

Conflicts:
	src/no/ntnu/fp/model/Alarm.java
	src/no/ntnu/fp/model/Appointment.java
	src/no/ntnu/fp/model/Employee.java