Process
Merge branch 'master' of http://www.github.com/WehtamP/370Project
Merge branch 'master' of http://www.github.com/WehtamP/370Project

Conflicts:
	src/Process.java
iarstni