changes
Merge branch 'master' of https://github.com/carlsc2/Opsys-HW4

Conflicts:
	main.py
Gotta go fast
Merge branch 'master' of https://github.com/carlsc2/Opsys-HW4

Conflicts:
	main.py
Merge branch 'master' of https://github.com/carlsc2/Opsys-HW4

Conflicts:
	main.py