initial install
Merge branch 'master' of https://github.com/andiegilmour/demo_app