2017-8-2
Merge branch 'master' of https://github.com/lly123/ProjectCI