Added stuff from laptop, and updated project and added bib file