adding test for collision calculation (thanks Zeken)
Merge branch 'master' of git@github.com:chaosct/MTCF-client.git