fixing fixed merge conflicting conflicts
Merge pull request #14 from wisconsinpoet/bird_branch

fixing fixed merge conflicting conflicts