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

Conflicts:
	CNAME
yaya