カテゴリの表示、登録を追加
インデントなどの調整
Merge branch 'master' into category

Conflicts:
	.DS_Store
	log/development.log
	tmp/cache/assets/C91/A20/sprockets%2F53640067d96589fbc39f702a6e19b645
	tmp/cache/assets/CA4/8B0/sprockets%2F21510ea8264eaa94d48104f903b60f39
	tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/D30/3B0/sprockets%2F40e4dc27315c8bb23ab744a9b4109d6d
	tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/D93/C50/sprockets%2Feb955148dff1a927d71ba221df32d1ac
Merge pull request #30 from kodamaa/category

Category　機能の追加