views.py changed a bit
database change-- need to push to github later
conflicts....
reset
models
purged
restored manage.py
bunch of things messed up
still messed up?
merge conflict as usual