from server
commit
Merge branch 'master' of https://github.com/soma-isuda/isuda-server
Merge branch 'master' of https://github.com/soma-isuda/isuda-server

Conflicts:
	models/model.js
Merge branch 'master' of https://github.com/soma-isuda/isuda-server