suicide animation: blow up
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
using os.path instead of custom path parsing
Merge remote-tracking branch 'upstream/master'

Conflicts:
	render.py
black/white text and slower cursor blink
fixed off-by one in render

finally sat down and worked through the logic of which frame is displayed vs which is rendered
fixed pausing behavior
two bug fixes:

- hp loss from collision was shown at start of turn
- moving slider could set turn to negative value
fixed whitespace for travis
Merge remote-tracking branch 'upstream/master'

Conflicts:
	run.py

merges parallel processing with latest render code
Merge remote-tracking branch 'upstream/master'
circle/square is now in settings
probably fixed off-by-one turns

I had overcomplicated it before. Thanks to mueslo for pointing it out.
fixed count of #robots corresponding to displayed turn #
Updated -A (no animate) code

it is now further decoupled from the animation code
Updated -A (no animate) code

it is now further decoupled from the animation code
Merge branch 'master' of github.com:wrongu/rgkit