Merge branch 'master' of https://github.com/xiaote/Email-Reader

Conflicts:
	ParseEmail.py
Source Code