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	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
Merge origin/master