Added acceptance tests and unit tests (forgot to push)
Merge branch 'master' of https://github.com/cs371p-spring-2013/cs371p-collatz-tests