Initial commit
Merge branch 'master' of https://github.com/jdelgado2002/hello_app

Conflicts:
	.gitignore