first problem
Merge branch 'master' of https://github.com/htc550605125/tyvjtraining