修正
修正
Merge branch 'master' of https://github.com/nakano-m/MasterOfPappets

Conflicts:
	routes/login.js
	views/userroom.jade
修正いろいろ