true	FacultyController.java	-/Modified	Commit	src\main\java\YogaStudio\Controller\FacultyController.java
true	WaiverEntity.java	-/Modified	Commit	src\main\java\YogaStudio\domain\WaiverEntity.java
true	FacultyService.java	-/Modified	Commit	src\main\java\YogaStudio\service\FacultyService.java
true	requestWaiver.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\waiver\requestWaiver.jsp
true	viewWaivers.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\waiver\viewWaivers.jsp
true	viewWaiversByFA.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\waiver\viewWaiversByFA.jsp
true	waiverDetails.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\waiver\waiverDetails.jsp
Merge origin/master