Screwed it up, but had to commit anyway.
Merge branch 'master' of https://github.com/mnichols612/JunkBot