Initial commit
Improve the README
Merge branch 'master' of https://github.com/JesusTinoco/sample_app

Conflicts:
	.gitignore
	README.md