Resolves 2.a.test, 2.a

Updated db.py and wrote test for 2.a.test
Merge branch 'geoModel' of https://github.com/FoggerApp/fogger into geoModel
Merge branch 'geoModel'
fixed merge conflicts