changed gitignore to ignore media dir and jpg files
resolving merge conflicts
have first enticing index view
fixed missing autodiscover thing
stubbed out view templates
home page linked up crudely
have home page linked up to /home
have album view linked up
working on home view
have crude home view working
have crude photo page working
have a photo displaying
album view working
fixed clean method in ImagrUser
friendship stuff not working, but we worked on it
ImagrUser model now has (theoretically) working friendship methods.
really basic stream working
forgot to commit all changes... stream working
failed attempt at redis thumbnail server
sorl thumbnail and memcached working