Merge pull request #3 from luisponce/master

3rd pull request
Cambios en generacion de obstaculos
Merge branch 'master' of https://github.com/semvidEAFIT/innova

Conflicts:
	innovaUnity/Assembly-CSharp.pidb
	innovaUnity/Assets/Scenes/Test2.unity
Player detects all types of collisions.
commit before pull from semvid repo
pull from semvid repo