aa
Merge branch 'master' of github.com:oh-sky/tabi-no-shiori

Conflicts:
	app/Controller/SpotsController.php