morinaomi edited the countryexplorer with essay added
countryexplorer is trying to be merged
i edited it
trying to merge
Merge branch 'master' of git://github.com/wyr4137/ICS5-Map
I deleted the head
head is erased
deleted country_explorer.html
I added more things
Merge branch 'master' of git://github.com/wyr4137/ICS5-Map
msg
Merge pull request #404 from morinaomi/master

please pull "msg"
fixed conflicts