added DOI and markup to readme

also, fixed branch conflict