Austin's first commit
This is a test commit
Merge branch 'master' of github.com:Odysseus-ScoutOut/scoutout-android

Conflicts:
	README.md