Fancified.
Merge branch 'master' of github.com:nh2/wordwang

Conflicts:
	client/css/style.styl
	client/index.html