gitignore追加
gitignore追加
Merge remote-tracking branch 'origin/master'

Conflicts:
	counter.txt