formatted date and time when adding question
fixed merge conflict in flaskr.py