Update from Mac
Merge branch 'master' of https://github.com/yukii/Sandbox

Conflicts:
test.txt
Modify