wp
Merge branch 'master' of https://github.com/wanghehacker/TitanGame

Conflicts:
	game/.idea/workspace.xml
wp
wp
ignore