some updates
changes to gitignore and fix merge problems in bib file
updated gitignore