5に変えたよ
Merge remote-tracking branch 'remotes/origin/work'

Conflicts:
	README.txt
Merge pull request #5 from timdeveloper/work

5に変えたよ