Screw everything about git, I am just copy-pasting my remote branch over this one until I have time to figure this out. Change history was just a single commit anyways.
Merge branch 'master' of github.com:kazagistar/rpsim

Conflicts:
	engine.py
	experiment.py