Removed extraneous ">" from web.xml and changed viewResolver suffix to
".hmtl"
Merge branch 'HEAD' of https://github.com/mattserrano/Barista-matic.git
into HEAD

Conflicts:
	barista-matic/src/main/webapp/WEB-INF/web.xml