Fix including bug
Merge branch 'master' of https://github.com/Dutch-devil/HTBaL

Conflicts:
	src/Floor.h