Minor change
Merge branch 'master' of github.com:sauravag/FIRM-OMPL

Conflicts:
	main.cpp