moving things around
Merge branch 'master' of https://github.com/scubbasteve302/QRiosity
Added web.xml