Prithvi Shahi eid:pbs428 cs:pshahi92
Merge branch 'master' of https://github.com/cs371p-fall-2014/collatz-tests