Buenos Aires draft
Merge branch 'buenos'
Final draft of Buenos Aires?
Adjusted location and travelled information
Added travelled field