This commit submits all of the required files needed for collatz.
Fixed #28 bug within private repo
Merge branch 'master' of https://github.com/cs371p-fall-2014/collatz-tests
changes to public repo between my pull and push