true	nb-configuration.xml	-/Modified	Commit	nb-configuration.xml
true	EnrollmentController.java	-/Modified	Commit	src\main\java\YogaStudio\Controller\EnrollmentController.java
true	waiverneedconfirmation.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\enrollments\waiverneedconfirmation.jsp
true	editProfile.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\user\editProfile.jsp
true	myaccount_mini.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\user\myaccount_mini.jsp
Merge origin/master