* コミット
Merge branch 'master' of https://github.com/syupein/pbl1_A.git

Conflicts:
	app/Controller/AppController.php