Made changes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Peckish Project/bin/Peckish Project.apk
	Peckish Project/bin/classes.dex
	Peckish Project/bin/classes/aiti/mit/sa/peckish/R$drawable.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/R$id.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/R$layout.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/R$menu.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/R$string.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/R$style.class
	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_
	Peckish Project/gen/aiti/mit/sa/peckish/R.java
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/R$drawable.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/R$id.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/R$layout.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/R$menu.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/R$string.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/R$style.class
	Peckish
Project/bin/classes/aiti/mit/sa/peckish/RecipeListActivity.class
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/addStuff.class
	Peckish Project/gen/aiti/mit/sa/peckish/R.java