foo
Merge branch 'master' of https://github.com/xiaoshanhuang/dotfiles

Conflicts:
	Sublime/Packages/User/Package
Control.cache/ad7758d143e99a76034aad71ae2a1f3b
	Sublime/Packages/User/Package
Control.cache/ad7758d143e99a76034aad71ae2a1f3b.info
	Sublime/Packages/User/Package Control.last-run
	Sublime/User/Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b
	Sublime/User/Package
Control.cache/ad7758d143e99a76034aad71ae2a1f3b.info
	Sublime/User/Package Control.last-run