zml
Merge branch 'dev' of https://github.com/baiyushiwhite/ZSH.git into dev
ll
Merge branch 'dev' of https://github.com/baiyushiwhite/ZSH.git into dev

Conflicts:
	.settings/org.eclipse.core.resources.prefs