Why do I need to commit? I don't even know.
Merge branch 'master' of https://github.com/jneighbs/newsfeed

Conflicts:
db.sqlite3
asdf