Our entry for tournament 2.
Syntax error in Python 2.6, fixed
Merge branch 'dalek_thay'

Conflicts:
	my_agent.py