small update
Merge remote-tracking branch 'origin/master'
fixed bib.bib \& character escaping.