#7
Merge branch 'master' of
https://github.com/YoshiteruIwasaki/PlayFrameworkRecruitConsole.git

Conflicts:
	build.sbt
	conf/application.conf
	conf/routes