Changes made to planner for imminent collision
Changes made to ramp_control for imminent collision
Added in changing the imminent_collision parameter back to false
Merge branch 'imminent_collision'

Conflicts:
	ramp_planner/src/planner.cpp