first commit from my mac
Merge branch 'master' of https://github.com/arkuuu/atom_test