Merge branch 'master' into 'addIceland'

# Conflicts: # README.md

Merge branch 'master' into 'addIceland'
# Conflicts: # README.md
bf0a7a88 · David Hoese · 25b44a32 · 28ace295 · bf0a7a88 · bf0a7a88
Commit bf0a7a88 authored 5 years ago by David Hoese
--- a/README.md
+++ b/README.md
 # countries
 Iceland
+Brazil
+France
+Croatia
 United States
--- a/brazil.txt
+++ b/brazil.txt
+Population: 209,300,000
+Capitol: Brasilia
+Largest City: Sau Paulo
--- a/croatia.txt
+++ b/croatia.txt
+Population: 4,154,000
+Capitol: Zagreb
+Largest city: Zagreb
--- a/france.txt
+++ b/france.txt
+Population: 66,991,000
+Capitol: Paris
+Largest City: Paris