side bar
Merge branch 'master' of https://github.com/simon-paris/deco3801-primate

Conflicts:
src/template.html
fix conflict