fixed table design from js file to css
merge conflict resolved
Merge branch 'master' of github.com:anniebae/wdi_the_nomads