added method to DinnerModel which returns TableModel for ingredient view
Merge branch 'master' of https://github.com/h10r/dinnerplanner-swing
resolved conflicts in DinnerModel.java
Conflicts:
	src/se/kth/csc/iprog/dinnerplanner/model/DinnerModel.java
Merge branch 'hendrik'
Merge branch 'master' of https://github.com/h10r/dinnerplanner-swing
merged branch master
Merge branch 'master' of https://github.com/h10r/dinnerplanner-swing
added ice cream dessert
fixing repo
added baked brie
added general tso's chicken
Merge branch 'master' into hendrik
resized chicken image