First commit
Merge branch 'master' of github.com:lucaskatayama/LearnAndroid

Conflicts:
	.gitignore