Initial Commit
Merge branch 'master' of https://github.com/pablouesc/first_app

Conflicts:
	.gitignore