"blæh"
"Merge conflict fixer naa"

Merge branch 'master' of https://github.com/mathiasose/fellesprosjekt

Conflicts:
	java_app/src/app/CalendarView.java
Merge branch 'master' of https://github.com/mathiasose/fellesprosjekt