some stuff
Merge branch 'master' of https://github.com/BrianCorbin/Op-Sys-Hw2

Conflicts:
	main.py