Merge branch 'master' of https://github.com/cahrsjo/Iprog14_Group20_Lab3

Conflicts:
	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/Checkout2.class

out/production/Iprog14_Group20_Lab3/se/kth/csc/iprog/dinnerplanner/andro
id/view/CourseDescriptionView.class
	src/se/kth/csc/iprog/dinnerplanner/android/Checkout2.java

src/se/kth/csc/iprog/dinnerplanner/android/view/CourseDescriptionView.ja
va
asdas
Merge branch 'master' of https://github.com/cahrsjo/Iprog14_Group20_Lab3

Conflicts:
	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/Checkout2.class

out/production/Iprog14_Group20_Lab3/se/kth/csc/iprog/dinnerplanner/andro
id/view/CourseDescriptionView.class
	src/se/kth/csc/iprog/dinnerplanner/android/Checkout2.java

src/se/kth/csc/iprog/dinnerplanner/android/view/CourseDescriptionView.ja
va