Maze Game Update 2.6
Merge remote-tracking branch 'origin/master'

Conflicts:
	Maze_Project.gmx/Maze_Project.project.gmx
	Maze_Project.gmx/rooms/Maze_3.room.gmx
	Maze_Project.gmx/sprites/images/sprite_down_0.png
	Maze_Project.gmx/sprites/images/sprite_down_1.png
	Maze_Project.gmx/sprites/images/sprite_down_10.png
	Maze_Project.gmx/sprites/images/sprite_down_11.png
	Maze_Project.gmx/sprites/images/sprite_down_2.png
	Maze_Project.gmx/sprites/images/sprite_down_3.png
	Maze_Project.gmx/sprites/images/sprite_down_4.png
	Maze_Project.gmx/sprites/images/sprite_down_5.png
	Maze_Project.gmx/sprites/images/sprite_down_6.png
	Maze_Project.gmx/sprites/images/sprite_down_7.png
	Maze_Project.gmx/sprites/images/sprite_down_8.png
	Maze_Project.gmx/sprites/images/sprite_down_9.png
	Maze_Project.gmx/sprites/images/sprite_up_0.png
	Maze_Project.gmx/sprites/images/sprite_up_1.png
	Maze_Project.gmx/sprites/images/sprite_up_10.png
	Maze_Project.gmx/sprites/images/sprite_up_11.png
	Maze_Project.gmx/sprites/images/sprite_up_2.png
	Maze_Project.gmx/sprites/images/sprite_up_3.png
	Maze_Project.gmx/sprites/images/sprite_up_4.png
	Maze_Project.gmx/sprites/images/sprite_up_5.png
	Maze_Project.gmx/sprites/images/sprite_up_6.png
	Maze_Project.gmx/sprites/images/sprite_up_7.png
	Maze_Project.gmx/sprites/images/sprite_up_8.png
	Maze_Project.gmx/sprites/images/sprite_up_9.png
	Maze_Project.gmx/sprites/sprite_down.sprite.gmx
	Maze_Project.gmx/sprites/sprite_up.sprite.gmx