initial commit
Merge branch 'master' of github.com:lordB8r/demo_app