Important change for Active without collision
Modifying collision
Merge remote-tracking branch 'origin/Sourav' into tyrone_cmdLine

Conflicts:
	src/simulatepath/Collision.java