n

haha
Merge branch 'master' of https://github.com/Intelli32/lab2

Conflicts:

workspace/MainActivity/src/se/kth/csc/iprog/dinnerplanner/android/view/E
xampleView.java