TH, TR
Beans
Merge branch 'master' of https://github.com/fordbill/web.git

Conflicts:
	ps10/WebContent/inventory.jsp