対応中
Merge branch 'master' of https://github.com/omiend/ProjectD

Conflicts:
	build.sbt
consoleに修正