extend django user model
Merge branch 'master' into extend-user-model-with-points
swap out user model
userprofile
removed auth model swap
added profiles to installed apps
profile admin
made social auth associate by email
updated field name and description
added migrations for profiles
Merge pull request #15 from team-stroller/social-auth-respect-email

made social auth associate by email
Merge branch 'master' of github.com:team-stroller/critical_critiques

Conflicts:
	critical_critiques/critical_critiques/settings/base.py
added sign-in link to landing page
Submit a pull request

Users can submit pull requests for review. Currently they see a
disappointing page when they do so, but this will soon change.

Uses class-based views because AWESOME.
.gitignore
Merge branch 'master' into review-code

Conflicts:
	critical_critiques/critical_critiques/settings/base.py