student notes
Merge branch 'student/teacherform' into develop

Conflicts:
	Parent-Teacher/app/controllers/notes_controller.rb