Syntax fix in views.py; turned off debug
Merge branch 'dev' into live
Updates including registration and settings
Conflicts:
	educate/views.py
	educate/views.pyc
	settings.py
Cleanup
Fixed views.py diff
Sync branches
Merge https://github.com/timbarnes/QandAWeb into live

Conflicts:
	dj/settings.py
	educate/views.py
	educate/views.pyc
Settings and yamjam fixes
Merge branch 'live' of https://github.com/timbarnes/QandAWeb into live
Fix database conflice
Conflicts:
	db.sqlite3
Merge conflices
Add database file to .gitignore
Delete db.sqlite3

Not tracked.