Update 01-04-01-Mac-Setup.md

コンフリクトマーカーを削除
Merge pull request #5 from shinagaki/patch-1

Update 01-04-01-Mac-Setup.md