remove Sublime Text 2 files
Merge branch 'master' into gh
add Atom settings
Merge branch 'master' into gh