New2Split
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	CodificaAritmeticaStatica/CodificaAritmeticaStatica/Main.cpp