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

Conflicts:
	.DS_Store
	.matlab/R2013a/MATLABDesktop.xml.prev
	.matlab/R2013a/matlab.prf
	.matlab/R2013a/matlab.settings

Alfred.alfredpreferences/workflows/user.workflow.216F2A5A-1E28-4287-A485
-93008BC66273/proj.log
	Sublime/Packages/AutoWrap/autowrap.pyc
	Sublime/Packages/CompleteSharp/completesharp.pyc

Sublime/Packages/CompleteSharp/sublimecompletioncommon/completioncommon.
pyc

Sublime/Packages/CompleteSharp/sublimecompletioncommon/parsehelp/parsehe
lp.pyc
	Sublime/Packages/Default/Meta Info Summary.cache
	Sublime/Packages/Default/Startup.cache
	Sublime/Packages/User/Package
Control.cache/ad7758d143e99a76034aad71ae2a1f3b
	Sublime/Packages/User/Package
Control.cache/ad7758d143e99a76034aad71ae2a1f3b.info
	Sublime/Packages/User/Package Control.last-run
foo