ignoreリストの記載変更
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Merge pull request #2 from Masaharu/master

設定変更