Redid a fix
Merge branch 'master' of github.com:chuck211991/CSCI_6140

Conflicts:
	queue_simulator/src/com/logrit/simulator/ProcessStatistics.java