edit settings add save and load methods
merge branches; disable debugout output in collisionDetection