week view thing attempt stuff swing is dumb
Merge branch 'master' of github.com:mathiasose/fellesprosjekt into calendar

Conflicts:
	java_app/src/app/CalendarView.java