rust
Merge branch 'master' of https://github.com/eriksvedang/Sublime-Text-3

Conflicts:
	Installed Packages/Rust.sublime-package