adds button
fixes conflicts
Merge pull request #1 from masidonion/jake

adds button