a
Merge branch 'master' of github.com:blue7wings/Daijia

Conflicts:
	README.md