makeFile
Merge branch 'master' of https://github.com/ksliker89/HashFunction
Delete balls.cpp
push push
Merge branch 'master' of https://github.com/s3c4nt/HashFunction

Conflicts:
	Tools.cpp
	Tools.h
Delete main2.o
up to date
Merge branch 'master' of https://github.com/ksliker89/HashFunction
Merge pull request #4 from s3c4nt/master

finally up to date
Merge pull request #5 from ksliker89/master

up to date with master changes