prepare enviroment
Merge branch 'master' of github.com:mangaohua/itjz8

Conflicts:
	.gitignore