itan
Merge branch 'master' of https://github.com/qsona/SocketShogi

Conflicts:
	package.json
	routes/index.coffee
	views/index.jade
	views/layout.jade