acceptance and unit tests passed
Merge branch 'master' of github.com:cs327e-spring-2014/collatz-tests