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	ClassEntity.java	-/Modified	Commit	src\main\java\YogaStudio\domain\ClassEntity.java
true	CustomerEntity.java	-/Modified	Commit	src\main\java\YogaStudio\domain\CustomerEntity.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
Merge origin/master