pulling
Merge branch 'master' of https://github.com/duke-compsci408-fall2014/PropelPro
fixed bug when no bounds are in db
Merge branch 'master' of https://github.com/duke-compsci408-fall2014/PropelPro
edit contact vc now prepopulates the contact info and settings
contacts fully implemented now