Main basico
Merge branch 'master' of https://github.com/Pablo--Martinez/Prog4

Conflicts:
	Code/Sistema.cpp