hello
Merge branch 'master' of https://github.com/JsFlo/SchedulingAppointment

Conflicts:
	AdvisingSchedulingApplication/src/main/webapp/WEB-INF/views/addAppointment.jsp
	AdvisingSchedulingApplication/target/classes/.gitignore