fix
z
Merge branch 'master' of https://github.com/finafisken/finafisken.github.io

Conflicts:
	.DS_Store