Merge pull request #1 from superdamage/pre-jam

Pre jam
Merge branch 'gh-pages' into pre-jam