merge images
Merge branch 'master' of https://github.com/xiaoweixu/rookie
test