Added some stuff to prepare query
Merge branch 'master' of https://github.com/ben100691/webprogramming2