test
update
Merge branch 'master' of https://github.com/jwall9108/CS7637Project1.git

Conflicts:
	src/project1/Agent.java