Things...

I need more verbose commit titles…
Merge branch 'master' of https://github.com/Enraric/Sorcerers-Maze

Conflicts:
	newMain.t
Github weirdness
Merge branch 'master' of https://github.com/Enraric/Sorcerers-Maze