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

Conflicts:
	.gitignore
Merge branch 'master' of github.com:jflindenjr/first_app

Conflicts:
	.gitignore
Merge branch 'master' of github.com:jflindenjr/first_app