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

Conflicts:
	.gitignore
fixing .gitignore