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

Conflicts:
	KalenderProsjekt/src/framePackage/DayView2.java
Merge branch 'master' of git@github.com:Daveiac/FProj_Gruppe48.git