tweaks
Merge branch 'master' of https://github.com/joeldenning/cs470.git
stuff
Merge branch 'master' of https://github.com/joeldenning/cs470.git

Conflicts:
	src/agent/GridFilterAgent.java