Moved collision methods

Moved collision methods to the scope of the gameboard object
Collision methods tested