Fixed declaring things  before includes
Merge branch 'master' of https://github.com/Dutch-devil/HTBaL

Conflicts:
	src/Room.h