Added teams
Merge branch 'master' of https://github.com/Bradshaw/octo-hipster

Conflicts:
	src/Robot.js
	src/game.js
Merge branch 'master' of https://github.com/Bradshaw/octo-hipster

Conflicts:
	src/game.js
Merge branch 'master' of https://github.com/Bradshaw/octo-hipster
Merge branch 'master' of https://github.com/Bradshaw/octo-hipster

Conflicts:
	src/Robot.js
It's getting there
Merge branch 'master' of https://github.com/Bradshaw/octo-hipster