Removed '<<<<<Head' from models.py.  Whoops.
Removed '===' git tail.
Still fixing merge conflict.
Finally fixed merge conflict.
Merge branch 'master' of https://github.com/allevitan/olinbartering