removed unnecessary commits
Added school zoning display
merge