add and update modules
Merge branch 'master' of github.com:justmao945/lab

Conflicts:
	private/common/user/.vimrc