Merge pull request #1 from timdeveloper/work

Work Commit
3に変えたよ
Merge pull request #2 from YoshidaGitTest/master

コミット願い
コミットできる
Merge pull request #4 from EmiYoshida/patch-1

コミットできる
Merge remote-tracking branch 'remotes/origin/work'

Conflicts:
	README.txt