blender merge
Merge branch 'blender' of github.com:brunocascio/sdl-python-e1 into blender

Conflicts:
	Blender/1-JuegosDeCubos_Palabras.blend
	Blender/1-JuegosDeCubos_Palabras.blend1
	Blender/1-JuegosDeCubos_Palabras.blend2