initial commit
Merge branch 'master' of github.com:penabianca/first_app

Conflicts:
	README.md