added second Test scene
Player identification of other colliders (tags)
pull from semvid repo
2nd pull from semvid repo
Merge pull request #2 from luisponce/master

Second merge with semvid repo
Some changes. LevelHelper deleted.
OLA KE ASE YA ESTA
JumpCounter implementado.
Boy prefab changes, jumpCounter deletes objects after collision.
Changes in folder structure.
Cambios en la multitud
Changes.
Cambios castelo
Changes in obstacle prefabs and obstacle generation.
Merge http://github.com/semvidEAFIT/innova
Cambios
player jump fixed
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