changes
Merge branch 'master' of https://github.com/gardefjord/gardefjord.github.io

Conflicts:
	_sass/style.sass