ny greie
ny ting
Merge branch 'master' of ssh://git@github.com/johnolos/fpg1.git

Conflicts:
	CalenderApp/src/baseClasses/Alarm.java
andrea prøver
Merge branch 'master' of ssh://git@github.com/johnolos/fpg1.git
isIdiot