Changed dir name to CollisionController
Merge branch 'master' of https://github.com/AayushB/Remote-Epsilon

Conflicts:
	libraries/CollisionController/collisionController.cpp
	libraries/CollisionController/collisionController.h
	libraries/collisionController/CollisionController.cpp
	libraries/collisionController/CollisionController.h
	libraries/collisionController/collisionController.cpp
	libraries/collisionController/collisionController.h