fixed a bug which prevented the game from working :(; refactored the shape class; added a nice collision method;