changes were made
changes been made
Merge branch 'master' of https://git@github.com/MIT-Team-Peckish/Peckish.git

Conflicts:
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/addStuff.class
	Peckish Project/src/aiti/mit/sa/peckish/classes/addStuff.java
Changed Optimization return type from Recipe[][] to ArrayList<Recipe>
Updated Item class
Merge remote-tracking branch 'origin/master'

Conflicts:
	Peckish
Project/bin/classes/aiti/mit/sa/peckish/RecipeListActivity.class
	Peckish
Project/bin/classes/aiti/mit/sa/peckish/classes/Catalogue_Items.class
	Peckish
Project/bin/classes/aiti/mit/sa/peckish/classes/Goal$Objective.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/Goal.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/Item.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/addStuff.class
Added Convert and Quantity Analysis functions
Merge branch 'master' of git@github.com:MIT-Team-Peckish/Peckish.git

Conflicts:
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/Item.class
Merge branch 'master' of git@github.com:MIT-Team-Peckish/Peckish.git

Conflicts:
	Peckish Project/bin/classes/aiti/mit/sa/peckish/RecipeListActivity.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/Catalogue_Items.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/Goal$Objective.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/Goal.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/Item.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/gen/aiti/mit/sa/peckish/R.java
	Peckish Project/src/aiti/mit/sa/peckish/classes/addStuffTwo.java
Merge Resolution
Merge branch 'master' of git@github.com:MIT-Team-Peckish/Peckish.git