v.10
v.1.1
new
cname
wtf
Merge branch 'master' of https://github.com/shawnhero/shawnhero.github.io

Conflicts:
	CNAME