Create, edit, delete
Merge branch 'develop' into classroom/creation

Conflicts:
	Parent-Teacher/app/models/parent.rb
	Parent-Teacher/app/models/teacher.rb
	Parent-Teacher/db/schema.rb
	Parent-Teacher/db/seeds.rb