Fixed bug that crashed the app
Merge branch 'master' of https://github.com/efunsten/SmartShopper

Conflicts:
	finalProject/.classpath
	finalProject/gen/com/example/finalproject/R.java
	finalProject/gen/com/google/android/gms/R.java