update
Merge branch 'master' of https://github.com/fomori/fomori.github.io

Conflicts:
	css/main.css
	hello.html
	index.html
	js/main.js