Modified the .gitignore
Merge branch 'two' of github.com:mackorone/mms into two

Conflicts:
	src/maze_files/auto_generated_maze.maz