update
added .gitignore
Merge branch 'master' of github.com:jaycverg/test-web-app

Conflicts:
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/inventory/index.xhtml