updated
	new file:   readem
	deleted:    build_site.sh
	deleted:    run_jekyllmail.sh
Merge branch 'master' of github.com:linpengxuan/JekyllMail

Conflicts:
	_config.yml
	.git/MERGE_HEAD

	readme