ready to push
Merge branch 'master' of https://github.com/anniebae/wdi_the_nomads