Whatevs
Merge branch 'master' of https://github.com/semvidEAFIT/infiltration-game
Almost fix 210
Merge branch 'pathfinding' of https://github.com/semvidEAFIT/infiltration-game
Fix #210 entre mateoc y castillobg
Merge branch 'master' of https://github.com/semvidEAFIT/infiltration-game

Conflicts:
	Unity_Project/Assets/Prefabs/FireTeam/FireTeam 1.prefab
	Unity_Project/Assets/Prefabs/Soldier.prefab
	Unity_Project/Assets/Resources/fragGrenade.prefab
	Unity_Project/Assets/scenes/tests/All test.unity
	Unity_Project/Assets/scripts/src/characters/soldiers/Soldier.cs
	Unity_Project/Assets/scripts/src/pathfinding/Grid.cs
	Unity_Project/Assets/scripts/src/props/weapons/grenades/Grenade.cs