トップページ修正
Merge branch 'master' of https://github.com/mira-inc/cookapp

Conflicts:
	app/views/index.scala.html
	app/views/main.scala.html