edit bib file

Change bib file to .bib ending, fix syntax errors.
Merge remote-tracking branch 'origin/master'