Initial commit
Merge github.com:BananaPower/demo_app

Conflicts:
	.gitignore