test
Merge remote-tracking branch 'origin/master'

Conflicts:
	BrandAmbassador/gen/com/example/brandambassador/R.java
Merge branch 'master' of https://github.com/bwash34/Brand-Ambassador.git

Conflicts:
	BrandAmbassador/AndroidManifest.xml
	BrandAmbassador/bin/AndroidManifest.xml
	BrandAmbassador/bin/BrandAmbassador.apk
	BrandAmbassador/gen/com/example/brandambassador/R.java