init
Merge branch 'master' of github.com:justmao945/toy

Conflicts:
	README.md