added suppport for time
Merge branch 'master' of https://github.com/jirwin3/flaskr-ji