Add 404 and 500 error pages
Add new tempaltes and settings
Merge branch 'master' of github.com:lgoldstien/learning-django

Conflicts:
	pollsite/polls/templates/polls/index.html
	pollsite/pollsite/settings.py