Deleted calendar folder (was not a package)
interface added
update
update
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
Fixed conflict
Endret navn fra user til bruker
conflicts all over the place
Merge branch 'master' of ssh://git@github.com/jonasws/Fellesprosjekt.git

Conflicts:
	Fellesprosjekt/src/calendar/Mote.java
møterom
added branch moterom. Added class MoteRom
Created userinput branch and added ConsoleUI-class
Oppdatert ConsoleUI