HERE you go!!!
Merge branch 'master' of https://github.com/liutenghou/ForLeoConflict

Conflicts:
	readme.txt