prism junk
Merge branch 'master' of https://github.com/schwartzmx/DBProject
changes to srvlet and qr
conflicts yay