Added test houses
Merge branch 'master' of https://github.com/belks/world_sim

Conflicts:
	IrrerLukas/src/gui/opengl/OpenGLGraphicsLayer.java