Committing so I can merge.
Merge branch 'master' of https://github.com/gritterm/SeniorProject.git

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

Conflicts:
	Shoppier/bin/classes/net/shoppier/MainActivity$1.class
	Shoppier/bin/classes/net/shoppier/MainActivity.class
	Shoppier/bin/classes/net/shoppier/R$drawable.class
	Shoppier/bin/classes/net/shoppier/R$id.class
	Shoppier/bin/classes/net/shoppier/R$layout.class
	Shoppier/bin/classes/net/shoppier/R$menu.class
	Shoppier/bin/classes/net/shoppier/R$string.class
	Shoppier/bin/classes/net/shoppier/R$style.class
	Shoppier/bin/classes/net/shoppier/library/UserFunctions.class
	Shoppier/gen/net/shoppier/R.java
As far as I can tell, no problems.