fucked with process
Merge branch 'master' of github.com:WehtamP/370project

Conflicts:
	src/Process.java