gitignoreを修正
Merge branch 'develop' of github.com:LogicTkt/TestProject into develop

Conflicts:
	.gitignore