Merge pull request #3 from ksliker89/master

mergy 3
compiles again
Merge branch 'master' of https://github.com/s3c4nt/HashFunction

Conflicts:
	Tools.cpp
	Tools.h