Conflicts: docs/assets/css/bootstrap.css docs/scaffolding.html docs/templates/pages/scaffolding.mustache