image upload and display completed
image upload and display completed and merged with latest orgin master.
image upload and display completed and merged with latest orgin master.
image upload and display completed and merged with latest orgin master2.
Merge origin/master

Conflicts:
	yagastudio/src/main/java/cs425/yogastudio/DAO/FacultyDAO.java
	yagastudio/src/main/java/cs425/yogastudio/controller/ProductController.java
	yagastudio/src/main/webapp/WEB-INF/SpringMVC-servlet.xml
	yagastudio/src/main/webapp/WEB-INF/views/addProduct.jsp
	yagastudio/src/main/webapp/WEB-INF/views/productList.jsp