Merge pull request #1 from acbrewbaker/kevin

ohai
Merge pull request #2 from kevinchabreck/master

test