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	WaiverEntity.java	-/Modified	Commit	src\main\java\YogaStudio\domain\WaiverEntity.java
true	WaiverService.java	-/Modified	Commit	src\main\java\YogaStudio\service\WaiverService.java
true	customer.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\user\customer.jsp
true	requestWaiver.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\waiver\requestWaiver.jsp
true	viewWaivers.jsp	-/Added	Commit	src\main\webapp\WEB-INF\views\waiver\viewWaivers.jsp
Merge origin/master