Initial commit
Merge branch 'master' of github.com:covingtondoan/first-app

Conflicts:
	.DS_Store
	.gitignore