additions
Merge branch 'master' of https://github.com/rpietro/Sublime_text_snippets

Conflicts:
	Package Control.sublime-settings