Avance parcial sobre el hash
Merge branch 'master' of https://github.com/federicomrossi/7506-tp-grupo07

Conflicts:
	codigo/logica_BlockTable.cpp