teori om sandsynlighed, occupancy grid og sensormodel
Merge branch 'master' of github.com:Thalmann/sw505-rapport

Conflicts:
	Presentation/presentation.tex