shopping cart is done
shopping cart is done
shopping cart is done
Merge origin/master

Conflicts:
	oak_yoga_studio/src/main/java/com/oak_yoga_studio/domain/Section.java
	oak_yoga_studio/src/main/webapp/WEB-INF/views/index.jsp