updating ADP agent
Merge branch 'master' of https://github.com/wboag/Obstacles

Conflicts:
	relayrace.py
Merge branch 'master' of https://github.com/wboag/Obstacles
Allow ADP agent to hash on state objects
Merge branch 'master' of https://github.com/wboag/Obstacles

Conflicts:
	agent.py
re-adding my changes, that I lost