Ushuaia draft
Merge branch 'ushuaia'
Exerpt and corrections
Added quote markdown syntax
Corrections
Merge branch 'master' of https://github.com/maerch/maerchiquidi