Merge branch 'master' of https://github.com/hiroshihonma/phpstudy

Conflicts:
	.gitignore