fixed bad pull merge
Merge pull request #21 from fuzzybabybunny/test

fixed bad pull merge