Made changes to list view
made changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	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/RecipeViewActivity$1.class
	Peckish
Project/bin/classes/aiti/mit/sa/peckish/RecipeViewActivity.class
	Peckish Project/gen/aiti/mit/sa/peckish/R.java
	Peckish Project/src/aiti/mit/sa/peckish/RecipeListActivity.java
	Peckish Project/src/aiti/mit/sa/peckish/RecipeViewActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	Peckish Project/gen/aiti/mit/sa/peckish/R.java
	Peckish Project/src/aiti/mit/sa/peckish/classes/addStuffTwo.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/gen/aiti/mit/sa/peckish/R.java
Merge branch 'master' of https://git@github.com:443/MIT-Team-Peckish/Peckish.git

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/gen/aiti/mit/sa/peckish/R.java