cleaned up all the collition methods
added end of game scoreboard
merged