Refractoring headers for successful build
Merge branch 'master' of https://github.com/Marcial1234/COP3503-Project

Conflicts:
	hash.cpp
	main.cpp