WOOOOORKKKK
Merge branch 'master' of github.com:jfmyers9/ThePantry

Conflicts:
	ThePantry/bin/R.txt
	ThePantry/bin/ThePantry.apk
	ThePantry/bin/classes.dex
	ThePantry/bin/resources.ap_
	ThePantry/gen/cs169/project/thepantry/R.java
	ThePantry/res/values/strings.xml