All command line params updated
Merge branch 'master' of github.com:danielfinke/cpsc425

Conflicts:
	test