changed branding
Merge branch 'gh-pages' of github.com:frc/Frantic-S3-Browser into gh-pages
fixed conflict
Merge branch 'master' into gh-pages