Prepare for conflicts merge for twitter/views.py
Merge branch 'master' of https://github.com/hdt91/CS3281
Production code
Merge branch 'master' of https://github.com/hdt91/CS3281