commit before pull
Merge branch 'gh-pages' of https://github.com/fightforthefuture/reset-the-net-homepage into gh-pages
FF fix for ribbon