Merge branch 'master' of https://github.com/cicadas-2014/Embark into Jess
Fixing merge conflict
Fixing merge for gemfile
Merge branch 'master' into Jess
Merge pull request #30 from JessicaTatham/Jess

working on making top20 countries have images