add
Merge branch 'master' of github.com:kumakoji/TestCake

Conflicts:
	app/Controller/PostsController.php
	app/Model/Post.php