Deleted a GIT merge conflict artefact.
kproj6-doc.tex: Fixed citations and figure references (Two spaces are unnecessary and ugly).
source_library.bib: Added TDT4290:Intro, 3GPP, Leaflets, OpenLayers and SINMOD
Makefile: Uncommented bibtex