Committing to merge mah doxy.
Merge branch 'master' of https://github.com/schiem/roguelike

Conflicts:
	Doxyfile