Startet å jobbe med kalenderen
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Utgangspunkt for kalenderen
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/MainWindow.java
Merge remote-tracking branch 'origin/master'
La til kalender til hovedvinduet