Merge branch 'master' of ssh://git@github.com/jonasws/Fellesprosjekt.git

Conflicts:
	Fellesprosjekt/src/calendar/Mote.java