Initial Commit
Merge branch 'master' of github.com:ScienceofSpock/demo_app

Conflicts:
	.gitignore