en3643 final submission
Merge branch 'master' of http://github.com/cs313e-fall-2014/collatz-tests