fix merge
Merge branch 'master' of github.com:powerloon/cs362
edited makefile and fixed Process class
fixed the Process problem