First attempt at test_adversary
Merge branch 'master' of https://github.com/jvanbrug/cs152model

Conflicts:
	tests.py
Completed first attempt at test_adversary, waiting on Adversary
Merge branch 'master' of https://github.com/jvanbrug/cs152model