tests for tdashroy (Troy Pocklington)
Merge branch 'master' of github.com:cs371p-spring-2013/cs371p-collatz-tests

Re-pulling