Initial commit.
Merge branch 'master' of https://github.com/jameslegue/demo_app
Merging to sort ouf conflicts during the tutorial.
Fake commit, added a comment in Gemfile