updated run_scheduler
Merge branch 'master' of https://github.com/236b-RTP/RTP

Conflicts:
	lib/run_scheduler.rb
Merge branch 'master' of https://github.com/236b-RTP/RTP

Conflicts:
	lib/run_scheduler.rb
Merge branch 'master' of https://github.com/236b-RTP/RTP