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

Conflicts:
	.matlab/R2013a/history.m
	.matlab/R2013a/toolbox_cache-8.1.0-4227827077-maci64.xml