calass GapCalculator, class ParallelController
Cmake
Cmake
calass GapCalculator, class ParallelController
Conflicts:

	src/ottocar_einparken/CMakeLists.txt
cmake
nochmal cmake
Merge branch 'master' of https://github.com/razinanu/ottocar

Conflicts:
	src/ottocar_einparken/CMakeLists.txt