merge
Merge branch 'master' of https://github.com/bwash34/Brand-Ambassador.git

Conflicts:
	BrandAmbassador/bin/BrandAmbassador.apk
	BrandAmbassador/bin/classes.dex
	BrandAmbassador/bin/classes/com/example/brandambassador/AddEventActivity.class
	BrandAmbassador/bin/resources.ap_