removed todo
added teamlogic to rooms if teammode is on. currently teammode is hardcoded in
Merge pull request #233 from cooperjbrandon/TeamModeBotStuff

Team mode bot stuff
Merge branch 'dev' of github.com:satellite-game/Satellite into serverTeams
cleanup
Adding players vs bots/players vs players toggle to create game menu
Bots can be toggled on and off on the create game screen
bugfix for no longer freezing on second player joining game
Gamepad controls now working properly
Merge branch 'dev' into controllers
Merge pull request #234 from ehannum/controllers

Controllers, flight stick, keyboard all working and implemented with Oculus
mergefix for menu changes to room creation
create room and join room bug fixed
Merge branch 'dev' into controllers
Merge pull request #235 from ehannum/controllers

Create room and join room bug fixed
merge for room create/join seperated logic
bugs fixed! nailed those bugs!
Merge pull request #236 from stites/serverTeams

Server teams
minor changes. to be rewritten when merge with dev
Merge branch 'dev' into TeamModeBotStuff and fix number of enemy bots problems

Conflicts:
	client/game/classes/s.Bot.js
	client/game/classes/s.SatelliteGame.js