mods minor
Merge branch 'master' of https://github.com/joeldenning/cs470.git

Conflicts:
	src/controller/Controller.java