initial push
fixed merge issue

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