updating views.py *twitter insanity*
Merge branch 'master' of https://github.com/sassafrass6/cs373-idb