Conflicts:
	CMakeLists.txt
	Simulation.cpp
	Simulation.h
	events/EventManager.cpp
	general/ArgumentParser.cpp
	general/ArgumentParser.h
	general/Macros.h
	geometry/Building.cpp
	geometry/Building.h
	main.cpp
	math/ForceModel.cpp
	math/ForceModel.h
	math/ODESolver.cpp
	math/ODESolver.h
	mpi/LCGrid.cpp
	mpi/LCGrid.h
	pedestrian/Pedestrian.cpp
	pedestrian/Pedestrian.h