Shape class stuff

Added creation method in testGrid, created collision method