latest updates to site - merge conflict guaranteed
Merge branch 'master' of https://github.com/nicolastelfer/my-site

Conflicts:
	personal-site/dev/sass/chunks/_chunk.section.scheme-colours.scss
	personal-site/site.html
	personal-site/site/assets/css/main-styles.css