test
test
test
test
Update src/DistrictPlanner.java

Test merge conflicts
test
test

test
initial solution 20/40 houses