socket.ioの機能いろいろ追加
Merge branch 'master' of https://github.com/nakano-m/MasterOfPappets

Conflicts:
	views/layout.jade
Merge branch 'master' of https://github.com/nakano-m/MasterOfPappets

Conflicts:
	app.js
	views/layout.jade