Modified includes to work with 'make dist'.
Merge branch 'master' of https://github.com/schiem/roguelike

Conflicts:
	src/character_classes/spawner.cpp
	src/gui/game.cpp