made changes to recipe
Merge remote-tracking branch 'origin/master'

Conflicts:
	Peckish Project/bin/classes/aiti/mit/sa/peckish/MainActivity.class
	Peckish
Project/bin/classes/aiti/mit/sa/peckish/RecipeListActivity.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/Recipe.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/addStuff.class
	Peckish
Project/bin/classes/aiti/mit/sa/peckish/classes/addStuffTwo.class
	Peckish Project/src/aiti/mit/sa/peckish/RecipeListActivity.java
	Peckish Project/src/aiti/mit/sa/peckish/classes/addStuff.java