showappointment
Merge branch 'feature/studentviewsappointments' into develop

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