Rocksolid edit
Merge branch 'master' of github.com:micalexander/sublime-user-settings
added packages
merge conflict