First Commit
Merge branch 'master' of github.com:josephcaxton/Android_Survey

Conflicts:
	.gitignore