Added some more functionality to the tower class.
Began implementing functionality for towers, added getClosestIntersectingEntity method.
Fixed merge conflict