ignore .DS_Store
Merge branch 'master' of github.com:NaixSpirit/code_maker