2
Merge branch 'master' of https://github.com/sunallen521/KaoAkao

Conflicts:
	KaoAKao2.0.v11.suo
Json