Commit
Merge branch 'master' of https://github.com/gritterm/SeniorProject.git

Conflicts:
	Shoppier/bin/classes/net/shoppier/AddActivity.class
	Shoppier/bin/classes/net/shoppier/GrocAdapter.class
	Shoppier/bin/classes/net/shoppier/MainActivity.class
	Shoppier/bin/classes/net/shoppier/R$id.class
	Shoppier/bin/classes/net/shoppier/R$string.class
	Shoppier/bin/classes/net/shoppier/R$style.class
	Shoppier/gen/net/shoppier/R.java
Merge branch 'master' of https://github.com/gritterm/SeniorProject.git

Conflicts:
	Shoppier/bin/classes/net/shoppier/MainActivity.class
	Shoppier/bin/classes/net/shoppier/R$drawable.class
	Shoppier/bin/classes/net/shoppier/R$id.class
	Shoppier/gen/net/shoppier/R.java