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