Alarm klasse
Merge branch 'master' of ssh://git@github.com/jonasws/Fellesprosjekt.git
Alarm endringer
Merge branch 'master' of ssh://git@github.com/jonasws/Fellesprosjekt.git
endring
Endringer i alarm
endringer i alarm
Alarm ferdig og testet
Merge branch 'master' into alarm
Merge branch 'master' of ssh://git@github.com/jonasws/Fellesprosjekt.git

Conflicts:
	Fellesprosjekt/src/calendar/Alarm.java