not sure comments
Merge branch 'master' of https://github.com/thecalvinchan/freemail

Conflicts:
	freemail/views.py
Merge branch 'master' of https://github.com/thecalvinchan/freemail