First commit.
Merge branch 'master' of github.com:cecepm/android-learn-hello

Conflicts:
	.gitignore