Resolving db_controller.py conflict.
Merge branch 'dev' of https://github.com/s-zhang/CMU-Maps-Backend into dev
Merge branch 'dev' of https://github.com/s-zhang/CMU-Maps-Backend into dev
Committing db_controller.py in preparation for merge.