fixed file
Merge branch 'master' of github.com:tachijuan/python

Conflicts:
	mail.py

stupid stuff
dumbererer