Merge branch 'pre-jam' into jam
Merge pull request #3 from superdamage/jam

Merge branch 'pre-jam' into jam