adfspbuioanobankl;
Merge branch 'master' of github.com:WehtamP/370project

Conflicts:
	src/Runner.java
asdfjl;asdfjkl;
Merge branch 'master' of github.com:WehtamP/370project

Conflicts:
	src/Scheduler.java