Merge branch 'master' of git@github.com:MIT-Team-Peckish/Peckish.git

Conflicts:
	Peckish Project/bin/classes/aiti/mit/sa/peckish/classes/addStuffTwo.class
	Peckish Project/src/aiti/mit/sa/peckish/classes/addStuffTwo.java
Merge Resolution
Merge branch 'master' of git@github.com: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/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