changed import stmt from collatz2 to collatz
Merge branch 'master' of https://github.com/cs373-spring-2014/collatz-tests