Endret shit
Merge branch 'master' of https://github.com/aleksanb/fellesprosjektet

Conflicts:
	src/core/CalendarProgram.java
Merge branch 'master' of https://github.com/aleksanb/fellesprosjektet