try hooking up email in heroku
reset password
Merge branch 'master' of github.com:sealgair/HaikuBattle

Conflicts:
	haikubattle/settings.py