Foo Commit
Merge branch 'master' of https://github.com/TrippelC/Dinner

Conflicts:
	DinnerPlannerSwing/src/se/kth/csc/iprog/dinnerplanner/DinnerPlanner.java