add
Merge branch 'master' of github.com:debugger/mysublime

Conflicts:
	.gitignore
	User/Preferences.sublime-settings