rewrote appointment list to hashmap
Merge branch 'master' of github.com:aleksanb/fellesprosjektet

Conflicts:
	src/core/CalendarProgram.java