local changes
Merge branch 'master' of github.com:sauravag/FIRM-OMPL

Conflicts:
	FIRM2DSetup.h
	main.cpp
Merge branch 'master' of github.com:sauravag/FIRM-OMPL
Adding corridoor world 2 env