added email to settings.py
Merge branch 'master' of https://github.com/scwu/wall-tipr