update
Merge branch 'master' of github.com:tung-dang/my-dot-files

Conflicts:
	sublime3/Color Highlighter/themes/Material.tmTheme
	sublime3/Package Control.sublime-settings
	sublime3/SublimeLinter/Monokai (SL).tmTheme