added section on horizontal and vertical sensormodel
Hopefully fixed a merge conflict
Merge branch 'master' of https://github.com/Thalmann/sw505-rapport

Conflicts:
	indhold/mapping.tex