Merge branch 'gh-pages' of https://github.com/fightforthefuture/battleforthenet-www into gh-pages

Conflicts:
css/battleforthenet.css
sept10th/index.html
fix for battleforthenet.css conflict