s3t5
Merge branch 'gh-pages' of github.com:sf-poker-league/home into gh-pages

Conflicts:
	javascripts/main.js