true	EnrollmentController.java	-/Modified	Commit	src\main\java\YogaStudio\Controller\EnrollmentController.java
true	EnrollmentDAO.java	-/Modified	Commit	src\main\java\YogaStudio\dao\generic\EnrollmentDAO.java
true	EnrollmentEntity.java	-/Modified	Commit	src\main\java\YogaStudio\domain\EnrollmentEntity.java
true	EnrollmentService.java	-/Modified	Commit	src\main\java\YogaStudio\service\EnrollmentService.java
true	viewEnrollments.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\enrollments\viewEnrollments.jsp
true	home_nagivation.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\home_nagivation.jsp
true	nagivation.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\nagivation.jsp
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	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
Merge origin/master