A
asdf
god i hope this works
Small UI Fixes
yayayayaya
Merge branch 'master' of https://github.com/CMPUT301W13T11/FoodBook.git
added super call so it has array of views
d
--
a
Delete Recipe
adding addView
Merge remote-tracking branch 'origin/master'
merged
added notifyViews
added notifyViews for storeResults
-
servercontroller
Merge branch 'master' of https://github.com/CMPUT301W13T11/FoodBook.git

Conflicts:
	FooBook/res/layout/activity_edit_recipe.xml
	FooBook/src/ca/ualberta/cmput301w13t11/FoodBook/EditRecipeActivity.java