From work computer, need to undo
From work computer, need to undo
Merge branch 'master' of https://github.com/trinity7designs/studentportal

Conflicts:
	app/controllers/schedules_controller.rb
	app/views/schedules/show.html.erb
Renamed schedule table and updated relationship