email settings added
Merge branch 'master' of heroku.com:competitie

Conflicts:
	competitie/email_settings.py
django-todo installed