update sublime settings and add .gitignore
Merge branch 'master'

Conflicts:
	Sublime Text 3/Preferences.sublime-settings