Update branch to include bootstrap gem again
Merge branch 'master' of https://github.com/mtschmitz/demo_app