Merge Resolution
Merge branch 'master' of git@github.com:MIT-Team-Peckish/Peckish.git
Updated Planner_BulkUp
Updated compare function to return highest to lowest
Merge branch 'master' of git@github.com:MIT-Team-Peckish/Peckish.git

Conflicts:
	Peckish Project/bin/Peckish Project.apk
	Peckish Project/bin/classes.dex
	Peckish Project/bin/classes/aiti/mit/sa/peckish/RecipeListActivity$1.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/RecipeListActivity.class
	Peckish Project/bin/resources.ap_