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

Conflicts:
	.matlab/R2013a/MATLABDesktop.xml
	.matlab/R2013a/MATLABDesktop.xml.prev
	.matlab/R2013a/cwdhistory.m
	.matlab/R2013a/history.m
	.matlab/R2013a/matlab.prf
	.matlab/R2013a/toolbox_cache-8.1.0-4227827077-maci64.xml
	Sublime/Packages/Default/Startup.cache
	Sublime/Packages/Default/Syntax Summary.cache
	Sublime/Packages/SublimeREPL/package-metadata.json
	Sublime/Packages/User/Package
Control.cache/ad7758d143e99a76034aad71ae2a1f3b
	Sublime/Packages/User/Package
Control.cache/ad7758d143e99a76034aad71ae2a1f3b.info
	Sublime/Packages/User/Package Control.last-run
	Sublime/Packages/User/encoding_cache.json