Submitting my acceptance and unit tests, Conan Goldsmith
Merge branch 'master' of https://github.com/cs371p-fall-2014/collatz-tests

My repo was out of date when I attempted to push