Merged all the game logic into game logic

Moved map and spawnmap into gamelogic
Merge remote-tracking branch 'upstream/master'
Merge pull request #18 from Wedgebear/master

Merged all the game logic into game logic
Merge remote-tracking branch 'upstream/master'
Merge pull request #19 from Wedgebear/master

Created an AddPlayer function