Added test for testCollisionDetection. Also made the move and setLocation functions return a boolean. I think this is a good way to test for collisions. Let me know if you all had other plans, we can always undo these quite easily