added corruption index code to seed file
fixed gemfile and seeds file conflict
Merge branch 'master' of https://github.com/cicadas-2014/Elsewhere into corruption_code
Merge branch 'master' of https://github.com/cicadas-2014/Elsewhere into Jess
added .travis.yml and seeded contry table with 2 letter language codes
updated seed file to resilve conflicts
fixed seed file to add Russia as common name
Merge branch 'master' of https://github.com/cicadas-2014/Elsewhere into corruption_code
Minor change to keep main image height consistent and auto-fit width
Working model rspec tests and 1 failing feature test
Merge branch 'master' of https://github.com/cicadas-2014/Elsewhere into Jess
Merge pull request #26 from JessicaTatham/Jess

Jess
format map layout and home page styling
fixed merge conflicts in index.html.erb
styled home page and fixed top nav bar
Merge pull request #27 from jjow/country_images

Minor change to keep main image height consistent and auto-fit width
fixed merge conflict
removed redundant document ready function
Merge pull request #28 from davek09/master

Map layout and home page styling
Hello csv file added...hello seeding in progress