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