Merge branch 'master' of github.com:nmcglohon/OSHomework2 into ProcWork_CTD

Conflicts:
src/AbstractProcess.java
src/Process.java
Merge branch 'master' of github.com:nmcglohon/OSHomework2 into ProcWork_CTD

Conflicts:
	src/AbstractProcess.java
	src/Process.java
Merge branch 'master' of github.com:nmcglohon/OSHomework2 into ProcWork_CTD

Conflicts:
	src/AbstractProcess.java
	src/Process.java
Merge pull request #7 from nmcglohon/b2_ProcWork

B2 proc work