cleaning up country lists
merge conflicts
Merge branch 'dev' of github.com:smaton1/sohohackathon into dev