?
fixed conflicts. Merge branch 'master' of https://github.com/wanderingstan/email2post

Conflicts:
	bin/create_letter.php