some changes
Merge branch 'master' of https://github.com/eric-zhu5121/miscs

Conflicts:
	vboxgen
fixed conflict