Merge pull request #1 from miracode/models

Models
pulled from master
Merge pull request #2 from miracode/models

Models
merging
Merge branch 'master' of https://github.com/miracode/django-imagr
Merge pull request #3 from miracode/models

Finished models, added followers, date_joined
Merge branch 'master' of github.com:jbbrokaw/django-imagr
Adds several views
Merge pull request #4 from miracode/views

Views
removing changes
removing changes
resolved merge conflict
Adds a placeholder gif
Changes user model (hoses database)
Adds login functionality, puts followers on admin page
Merge pull request #6 from miracode/fix-usermodel

Fix usermodel
Merge pull request #7 from miracode/login

Adds login functionality, puts followers on admin page
resolved conflict in models.py
adding tests for Travis
adding requirements