testing prospector/trader
Merge branch 'master' of github.com:jneem/puertorico

Conflicts:
	src/test/scala/puertorico/ActorTest.scala
prospector and trader debugging