rename country_id to country and change to string
Merge branch 'master' of https://github.com/eatmorespinach/ed_final