Added changed to make it work with reserved words etc
Merge branch 'master' of https://github.com/CanterburyRegionalCouncil/Quiz