Merge branch 'master' of github.com:jbbrokaw/telephone-project
Merge branch 'master' of github.com:jbbrokaw/telephone-project into connect-show-with-database
Updates dictionary keys in jinja template
Merge pull request #20 from jbbrokaw/connect-show-with-database

Connect show with database