Merge branch 'update-template-no-css' of github.com:fmichonneau/lesson-template into update-template-no-css