sooooo it seems I forgot to commit my last bugfixes...
Merge branch 'master' of github.com:kazagistar/rpsim

Conflicts:
	experiment.py