Added rudimentary scoring
Merge remote-tracking branch 'origin/live' into dev

Conflicts:
	educate/admin.pyc
	educate/models.pyc
	educate/urls.pyc
	educate/views.pyc
Added basic authentication: depends on django-registration-redux
Added basic registration form
Authentication first steps
Settings fixes
Added css
ignore files
Merge branch 'dev'

Conflicts:
	dj/settings.pyc
Added e-mail and registration to the commit list
sync db file
Merge branch 'dev' into live
Updates including registration and settings
Conflicts:
	educate/views.py
	educate/views.pyc
	settings.py
Cleanup