bug fixes for 3
Merge branch 'master' of github.com:jault3/CS386Lab4

Conflicts:
	src/main/scala/lab6/CmdLine.scala