Initial commit.
Merge branch 'master' of github.com:jeffjakub/demo_app

Conflicts:
	.gitignore