feature: dummy fields+moved headers+changed labels
Merge branch 'master' into city_state_dummy_fields
Include most up to master changes into city_state_dummy_fields branch before push
Merge pull request #43 from 4justinstewart/city_state_dummy_fields

City state dummy fields