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

Conflicts:
	images/site-logo.png