レイアウト修正
Merge branch 'master' of github.com:omiend/ProjectD
Merge branch 'master' of github.com:omiend/ProjectD

Conflicts:
	app/views/chatRoom.scala.html