commit to merge, add country drop down and search to people
Merge branch 'master' of https://github.com/eatmorespinach/ed_final