init commit
Merge branch 'master' of https://github.com/chenyi2013/Ed

Conflicts:
	README.md