update 20140604
Merge branch 'master' of https://github.com/chopsuey5000/chopsuey5000.github.io

Conflicts:
	CNAME
	index.html