deleted dishPickerView.java
Merge branch 'master' of github.com:jsh0rty/iprogLab2

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