Merge pull request #1 from acbrewbaker/kevin

ohai
Merge pull request #3 from kevinchabreck/master

asdfasdf