Nippe, bibliography and how to mister roboto changed
Conflict solved in report.tex