true	WaiverDAO.java	-/Modified	Commit	src\main\java\YogaStudio\dao\generic\WaiverDAO.java
true	FacultyEntity.java	-/Modified	Commit	src\main\java\YogaStudio\domain\FacultyEntity.java
true	WaiverEntity.java	-/Modified	Commit	src\main\java\YogaStudio\domain\WaiverEntity.java
true	editProfile.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\user\editProfile.jsp
true	myaccount.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\user\myaccount.jsp
true	rejectWaiverPopUp.jsp	-/Added	Commit	src\main\webapp\WEB-INF\views\waiver\rejectWaiverPopUp.jsp
true	viewWaivers.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\waiver\viewWaivers.jsp
true	viewWaiversByFA.jsp	-/Added	Commit	src\main\webapp\WEB-INF\views\waiver\viewWaiversByFA.jsp
true	FacultyController.java	-/Modified	Commit	src\main\java\YogaStudio\Controller\FacultyController.java
true	UserController.java	-/Modified	Commit	src\main\java\YogaStudio\Controller\UserController.java
true	WaiverDAO.java	-/Modified	Commit	src\main\java\YogaStudio\dao\generic\WaiverDAO.java
true	WaiverService.java	-/Modified	Commit	src\main\java\YogaStudio\service\WaiverService.java
true	rejectWaiverPopUp.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\waiver\rejectWaiverPopUp.jsp
true	viewWaiversByFA.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\waiver\viewWaiversByFA.jsp
true	waiverDetails.jsp	-/Added	Commit	src\main\webapp\WEB-INF\views\waiver\waiverDetails.jsp
Merge origin/master