Cleaned up the code if Ball.h and Ball.cpp

-Isolated collision detection and handling into different functions
-Removed uniused code
-Removed unusable console output
-Reset ball speed to the original
Fixed merge conflict