dfsdf
småting
fsfdhdsg
Merge branch 'hegdal'
prøver nokke
Merge branch 'master' of https://github.com/imaltont/PsychicWookie

Conflicts:
	src/no/ntnu/fp/model/Alarm.java
	src/no/ntnu/fp/model/Appointment.java
	src/no/ntnu/fp/model/Employee.java
	src/no/ntnu/fp/model/Group.java
	src/no/ntnu/fp/model/Location.java
	src/no/ntnu/fp/storage/DatabaseHandler.java
	src/no/ntnu/fp/storage/DatabaseSettings.java