Merge pull request #1 from crumpledpaper/master

Test
added jam
Merge pull request #1 from JLtheking/master

test