Fussing with command line options
Merge branch 'master' of https://github.com/AU-COMP5600-ChrisAlex/COMP5600

Conflicts:
	main.py
	ui.py