country_explorer

Hi,
I think I'm having some trouble getting my additions in. I initially made the pull request and there were conflicts so it wouldn't work. Then I updated my local files and corrected things then re-committed country_explorer a few times, but nothing is current in the master file.
Can you help me out?