instrucciones
Merge github.com:montselozanod/HeyWorld

Conflicts:
	HeyWorld/Game.cpp