time = 11
Merge branch 'master' of https://github.com/cloutier116/OpSysHW2

Conflicts:
	HW2.py