These are all of the files for the project.  Garlick said that it's ok
to upload everything as long as there are no passwords or anything like
that.
Merge branch 'master' of https://github.com/bwash34/Brand-Ambassador.git

Conflicts:
	BrandAmbassador/res/layout/activity_main.xml
	BrandAmbassador/src/com/example/brandambassador/MainActivity.java