html
Merge branch 'samuel' of https://github.com/samuellenok/Inventory.git into samuel
Web.xml is working