initial commit
Merge github.com:lurr25125/first_app

Conflicts:
	.gitignore