Fikser konflikt
Merge branch 'master' of https://github.com/hermanferre/fellesprosjekt

Conflicts:
	KalenderSystem/.classpath
Merge branch 'master' of https://github.com/hermanferre/fellesprosjekt