Reupload
Merge branch 'master' of https://github.com/derakim/derakim.github.io

Conflicts:
	CNAME
	_config.yml
	_includes/head.html
	_includes/navigation.html
	about.md
	index.html