Merge
Merge branch 'master' of github.com:nouveller/sink

Conflicts:
	Preferences.sublime-settings
Change font
SSH pair alias