Clean Up of some code
using theirs
Merge branch 'master' of https://github.com/mtrebell/CMPT305
Ians query builder ,added basic queries