true	editProfile.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\user\editProfile.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	navi.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\faculty\navi.jsp
true	viewWaiversByFA.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\waiver\viewWaiversByFA.jsp
true	waiverDetails.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\waiver\waiverDetails.jsp
true	CustomerController.java	Added/-	Commit	src\main\java\YogaStudio\Controller\CustomerController.java
true	LoggerAdvice.java	Deleted/-	Remove	src\main\java\YogaStudio\Controller\LoggerAdvice.java
true	UserController.java	Modified/-	Commit	src\main\java\YogaStudio\Controller\UserController.java
true	CustomerDAO.java	Modified/-	Commit	src\main\java\YogaStudio\dao\generic\CustomerDAO.java
true	FacultyDAO.java	Modified/-	Commit	src\main\java\YogaStudio\dao\generic\FacultyDAO.java
true	UserEntity.java	Modified/-	Commit	src\main\java\YogaStudio\domain\UserEntity.java
true	AdvisorService.java	Modified/-	Commit	src\main\java\YogaStudio\service\AdvisorService.java
true	CustomerService.java	Modified/-	Commit	src\main\java\YogaStudio\service\CustomerService.java
true	EmailAdvice.java	Modified/-	Commit	src\main\java\YogaStudio\service\EmailAdvice.java
true	UserService.java	Modified/-	Commit	src\main\java\YogaStudio\service\UserService.java
true	rootconfig.xml	Modified/-	Commit	src\main\webapp\WEB-INF\rootconfig.xml
true	customer.jsp	Added/-	Commit	src\main\webapp\WEB-INF\views\customers\customer.jsp
true	customer_navigation.jsp	Added/-	Commit	src\main\webapp\WEB-INF\views\customers\customer_navigation.jsp
true	main_customer_list.jsp	Added/-	Commit	src\main\webapp\WEB-INF\views\customers\main_customer_list.jsp
true	advisees.jsp	Modified/-	Commit	src\main\webapp\WEB-INF\views\faculty\advisees.jsp
true	facultyschedule.jsp	Modified/-	Commit	src\main\webapp\WEB-INF\views\faculty\facultyschedule.jsp
true	facultysectionlist.jsp	Modified/-	Commit	src\main\webapp\WEB-INF\views\faculty\facultysectionlist.jsp
true	home_nagivation.jsp	Modified/-	Commit	src\main\webapp\WEB-INF\views\home_nagivation.jsp
true	index.jsp	Modified/-	Commit	src\main\webapp\WEB-INF\views\index.jsp
true	nagivation.jsp	Modified/-	Commit	src\main\webapp\WEB-INF\views\nagivation.jsp
true	myaccount.jsp	Modified/-	Commit	src\main\webapp\WEB-INF\views\user\myaccount.jsp
true	userprofile.jsp	Modified/-	Commit	src\main\webapp\WEB-INF\views\user\userprofile.jsp
true	viewWaiversByFA.jsp	Modified/-	Commit	src\main\webapp\WEB-INF\views\waiver\viewWaiversByFA.jsp
true	custom.css	Modified/-	Commit	src\main\webapp\resources\public\css\custom.css
true	common.js	Modified/-	Commit	src\main\webapp\resources\public\js\common.js
Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/views/home_nagivation.jsp
	src/main/webapp/WEB-INF/views/nagivation.jsp
	src/main/webapp/WEB-INF/views/waiver/viewWaiversByFA.jsp