cleanup
cleaning up
Merge branch 'bugfix/appointments' into develop

Conflicts:
	Parent-Teacher/app/views/students/show.html.erb