Initial commit
Merge branch 'master' of github.com:johnbward/first_app

Conflicts:
	.gitignore

This is my first merge to remove unknown conflicts.