First commit
Merge github.com:houjieth/MyAce

Conflicts:
	README.md