マージ修正
Merge branch 'master' of https://github.com/mira-inc/cookapp
トップ
DB追加
Categoryテーブル追加
Merge branch 'master' of https://github.com/mira-inc/cookapp
Merge branch 'master' of https://github.com/mira-inc/cookapp

Conflicts:
	app/controllers/Application.java
	app/views/index.scala.html
	conf/routes