Worked on the repport
Merge branch 'master' of https://github.com/nicolaje/JOG-3D

Conflicts:
	doc/Rapport.docx
Added 3D JOG model designed by Charlotte Rieux