did some things with nullies
Merge branch 'master' of git://github.com/nzukoski/15440

Conflicts:
	lab1/src/com/cs440/lab1/classes/ProcessManager.java
mawec