Merge branch 'gh-pages'
added padding to #attractions and  new items in navbar
Merge branch 'master' into gh-pages