cleanup in DragAndDropController
Merge branch 'master' of https://github.com/jsh0rty/iprogLab2
Merge branch 'master' of https://github.com/jsh0rty/iprogLab2
Merge branch 'master' of https://github.com/jsh0rty/iprogLab2
Merge branch 'master' of https://github.com/jsh0rty/iprogLab2
added DishPickerViewController and cleaned up some code