subl
Merge branch 'master' of https://github.com/metakirby5/dotfiles

Conflicts:
	Preferences.sublime-settings