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
Edit Citations
Edit Citations
Update
head is erased
made html file for Botswana
edited the html final
took off the conflicts again
deleted country_explorer.html
I added more things
maldives essay
morocco
Merge pull request #397 from jiayug/master

essay for Maldives
Merge branch 'master' of git://github.com/wyr4137/ICS5-Map
adding essay