ChatRoom追加
Merge branch 'master' of https://github.com/omiend/ProjectD

Conflicts:
	app/controllers/Application.scala