Solve merge conflict

README.md

cpp/CMakeLists.txt

cpp/src/iLQR_obstacle_GPIS.cpp

doc/rcfs.pdf

doc/rcfs.tex

matlab/IK_nullspace.m

python/FD.py

python/FD_recursive.py

python/LQT.py

python/LQT_CP.py

python/LQT_recursive.py

python/LQT_recursive_LS.py

python/LQT_recursive_LS_multiAgents.py

python/iLQR_bicopter.py

python/iLQR_bimanual.py

python/iLQR_bimanual_manipulability.py

python/iLQR_car.py

python/iLQR_manipulator.py

python/iLQR_manipulator_CP.py

python/iLQR_manipulator_CoM.py