teacher_schedule
Merge branch 'feature/calendar' into develop

Conflicts:
	Parent-Teacher/app/assets/stylesheets/application.css.scss
	Parent-Teacher/app/views/layouts/application.html.erb
	Parent-Teacher/app/views/teachers/show.html.erb
	Parent-Teacher/db/schema.rb