Adding and removing permissions on doctor page
Merge branch 'master' of github.com:nganthony/ece356

Conflicts:
	src/main/java/com/ece356/controller/DoctorController.java