sanity commit
trails info page edited
Merge branch 'master' of github.com:anniebae/wdi_the_nomads
merge conflict resolved