adjust nothing
Merge branch 'master' of https://github.com/AikChun/Hashkit

Conflicts:
	app/View/Pages/hash_information.ctp