drawing buildings
weird git stuff
merge