CollectionActor set up in main
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/CollectionActor.java
	src/Found.java