Adding atom, grunt, gulp
Merge branch 'master' of github.com:leek/dotfiles

* 'master' of github.com:leek/dotfiles:
  Sync
  Syncing...

Conflicts:
	sublime-text/User/Preferences.sublime-settings