Sublime
gitignore
Merge branch 'car-imac'

* car-imac:
  gitignore
  Sublime

Conflicts:
	preferences/Sublime Text 3/Packages/User/Preferences.sublime-settings