"prover å fikse callender shit"
"prover a fixe callender shit"

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

Conflicts:
	java_app/src/kalender/ButtonColumn.java