new changes in the calculate proability of collision
Merge branch 'master' of https://github.com/AikChun/Hashkit

Conflicts:
	app/View/Layouts/layout.ctp