Merge pull request #245 from ehannum/controllers

Fixed that scrolling bug. Closes #237
change color of player for radar
Merge pull request #246 from cooperjbrandon/minorChanges

Minor changes
Merge branch 'dev' of https://github.com/satellite-game/Satellite into serverBotFix