added my essay to my own country file and added a line to the country explorer file
added my essay to Monaco file and added the line of code to the country file
solved the conflict
Merge pull request #260 from yunzhenz/master

added my essay and wrote the line of code in the country explorer file
Merge pull request #261 from elizabethdaisyxu/master

essay
edited essay format for macau.html
edited format for essay