Updated Optimizations
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/Planner.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/Planner_BulkUp.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/Planner_LoseWeight.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/Planner_LowCost.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/Planner_ReduceCancer.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/compareCarbohydrates.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/compareFat.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/compareProtein.class
	Peckish Project/gen/aiti/mit/sa/peckish/R.java
Merge branch 'master' of
https://git@github.com/MIT-Team-Peckish/Peckish.git

Conflicts:
	Peckish
Project/bin/classes/aiti/mit/sa/peckish/RecipeListActivity.class
	Peckish Project/gen/aiti/mit/sa/peckish/R.java