First Commit
Merge branch 'master' of https://github.com/avgarcia/android-helloworld

Conflicts:
	.gitignore
Fix