Merge branch 'master' of https://github.com/saiyukiz/Ball_Maze_Project

Conflicts:
	Ball_Maze_Project/._HelloWorldLayer.mm
hbryh
Merge branch 'master' of https://github.com/saiyukiz/Ball_Maze_Project

Conflicts:
	Ball_Maze_Project/._HelloWorldLayer.mm
peter