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

fightforthefuture/battleforthenet,fightforthefuture/battleforthenet,fightforthefuture/battleforthenet