Modificacion de un obstaculo
Merge branch 'master' of https://github.com/rovyoper/TB-CG-Final

Conflicts:
	src/TB_CG_Final/Juego.h
	src/TB_CG_Final/TB_CG_Final.vcxproj.filters