Commit to merge.
Merge branch 'master' of https://github.com/schiem/roguelike

Conflicts:
	src/world/chunk.cpp