Merge branch 'jam' into pre-jam
HERE WE GO
Merge pull request #4 from superdamage/pre-jam

HERE WE GO