Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Views/all_Schedules.erb
Changes