linlin part
Merge remote-tracking branch 'upstream/master' into dev
merge bib
add images
final check
Merge pull request #1 from xull0503/master

Update by linlin