Merge pull request #51 from wrongu/master

Animations
Robot names are displayed and color-coded
Merge remote-tracking branch 'upstream/master' into original

Conflicts:
	render.py
	run.py
changed param names

instead of user1 and user2, they are red_user and green_user
Merge branch 'original'

Conflicts:
	render.py

combines bot-names with suicide-explosions
probably fixes bug of occasionally crashing on move animation