Merge branch 'master' of https://github.com/grojasv/FundamentalesAndroid

Conflicts:
	.gitignore
	README.md