Cleanup bib file after merge
Merge branch 'Manuscript'
Ignore log files
Merge branch 'Manuscript'

Conflicts:
	.gitignore