Tentando finalizar o projeto fazendo a main.cpp
Merge branch 'master' of https://github.com/thiagovas/Macaco-Louco

Conflicts:
	DataMemory.cpp
	InstructionMemory.hpp