Initial commit
Merge https://github.com/calebprashant/first_app

Conflicts:
	.gitignore