Added edge detection
Fixed merge issues with the development of the edge detecsion
Edge collision detection added