initial checkin
Merge branch 'master' of https://github.com/GDGCapeTown/AskTheUniverseAndroidApp

Conflicts:
	.gitignore