bla bla
Merge branch 'master' of https://github.com/hunterbmt/xml_project

Conflicts:
	src/main/webapp/WEB-INF/views/resources/css/product.css

	modified:   src/main/webapp/WEB-INF/views/resources/css/product.css