Endret
Merge branch 'master' of https://github.com/mollersilje/su4.git
Merge branch 'master' of https://github.com/mollersilje/su4.git

Conflicts:
	su4/src/fellesp/Appointment.java
	su4/src/fellesp/AppointmentFactory.java