player flash fix
Merge branch 'master' of github.com:GoogleDH/Contra

Conflicts:
	web/source/Player.dart
robot fixes
Merge branch 'master' of github.com:GoogleDH/Contra

Conflicts:
	web/source/RobotManager.dart