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