potential merge
Merge branch 'master' of https://github.com/cman131/CGrepWithActors

Conflicts:
	src/Actors/ScanActor.java