A test Android upload
Merge branch 'master' of https://github.com/jpilfold/Android-Test

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/jpilfold/Android-Test