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

Conflicts:
	.gitignore