checkin local changes for now, will clean up later
add screenshots
Merge branch 'master' of https://github.com/tanzhenxin/library