test
Merge branch 'master' of https://github.com/chickendiver/CMPUT291W2014P1 into chase
added comments to pySql template