Empty popup added for each dish
Merge branch 'master' of https://github.com/cahrsjo/Iprog14_Group20_Lab3

Conflicts:
	.idea/workspace.xml
	out/production/Iprog14_Group20_Lab3/Iprog14_Group20_Lab3.apk
	out/production/Iprog14_Group20_Lab3/Iprog14_Group20_Lab3.unaligned.apk

out/production/Iprog14_Group20_Lab3/se/kth/csc/iprog/dinnerplanner/andro
id/ChooseMenu$1.class

out/production/Iprog14_Group20_Lab3/se/kth/csc/iprog/dinnerplanner/andro
id/ChooseMenu.class

out/production/Iprog14_Group20_Lab3/se/kth/csc/iprog/dinnerplanner/andro
id/DinnerPlannerApplication.class

out/production/Iprog14_Group20_Lab3/se/kth/csc/iprog/dinnerplanner/andro
id/view/Menu.class

out/production/Iprog14_Group20_Lab3/se/kth/csc/iprog/dinnerplanner/andro
id/view/MenuController.class

out/production/Iprog14_Group20_Lab3/se/kth/csc/iprog/dinnerplanner/model
/DinnerModel.class
	res/layout/popup.xml
	src/se/kth/csc/iprog/dinnerplanner/android/ChooseMenu.java
	src/se/kth/csc/iprog/dinnerplanner/android/view/Menu.java
	src/se/kth/csc/iprog/dinnerplanner/android/view/MenuController.java