I don't even know
Merge branch 'master' of github.com:WehtamP/370project

Conflicts:
	bin/FCFS_Scheduler.class
	bin/RR_Scheduler.class
Fixed problems with RR