Strategy Statefull
Merge branch 'master' of https://github.com/Gonzalo-F/Test-3

Conflicts:
	TP-Grupal/xtend-gen/tests/.gitignore