change wx to game1
Merge branch 'master' of https://github.com/yoshi315/blackbox.git

Conflicts:
	BlackBox/src/com/smart/newgame/MainActivity.java
what's the fuck