Deleted calendar folder (was not a package)
interface added
interface added
Fixed merge conflict
Merge branch 'master' of ssh://git@github.com/jonasws/Fellesprosjekt.git
settere og gettere
Merge branch 'master' of ssh://git@github.com/jonasws/Fellesprosjekt.git
Added interface
.
Merge branch 'master' of ssh://git@github.com/jonasws/Fellesprosjekt.git
Endret navn fra user til bruker
Alarm klasse
Merge branch 'master' of ssh://git@github.com/jonasws/Fellesprosjekt.git
Merge branch 'master' of ssh://git@github.com/jonasws/Fellesprosjekt.git

Conflicts:
	Fellesprosjekt/src/calendar/Mote.java (now fixed)