commiting v1!
Merge branch 'master' of https://github.com/okofish/sortinghat.me

Conflicts:
	img/hat.png