morgen
Merge branch 'master' of git@github.com:Daveiac/FProj_Gruppe48.git

Conflicts:
	KalenderProsjekt/src/client/Client.java