test commit with source tree
Merge branch 'master' of https://github.com/ericjohnolson/NadaNtd
Merge remote-tracking branch 'origin/jed-dev'
trying to merge
Redistricting split

Added new features and bug fixes
released redistricting-split features
fixed database update bug.
merge master