Cambios a player

Signed-off-by: Fernando V <fvalarinon@gmail.com>
Merge branch 'master' of github.com:obandox/silencio_capitolio

Conflicts:
	Assets/App/Prefabs/Player.prefab
	Assets/App/Scripts/Models/Character.cs
	ProjectSettings/ProjectSettings.asset
Merge branch 'master' of github.com:obandox/silencio_capitolio

Conflicts:
	Assets/App/Scripts/Models/Character.cs
detectando colision con npcs me falta el codigo para golpear.

Signed-off-by: Fernando V <fvalarinon@gmail.com>