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

Conflicts:
	app/Controller/HashTestsController.php