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	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	viewWaiversByFA.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\waiver\viewWaiversByFA.jsp
true	FacultyController.java	-/Modified	Commit	src\main\java\YogaStudio\Controller\FacultyController.java
true	viewWaiversByFA.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\waiver\viewWaiversByFA.jsp
Merge origin/master