grid
Merge branch 'master' of https://github.com/JamesAtkinson/jamesatkinson.github.io

Conflicts:
	css/main.css
	index.html
	scss/dependencies/_reset.scss
	scss/main.scss