MainView
Merge branch 'master' of https://github.com/pogestudio/InteractionLab2

Conflicts:
	src/se/kth/csc/iprog/dinnerplanner/swing/view/MainView.java