merge
Merge branch 'Maze' of https://github.com/ronlut/BooYa.git into Maze

Conflicts:
	BooYa/src/com/example/booya/MazeGameActivity.java