lock test
Merge branch 'master' of https://github.com/otakode/SpaceWar
advancing Lock

Signed-off-by: Otakode <marchal.cl@gmail.com>
Merge branch 'master' of https://github.com/otakode/SpaceWar

Conflicts:
	Assets/Resources/Prefabs/Game/Ship.prefab
Merge branch 'master' of https://github.com/otakode/SpaceWar

Conflicts:
	Assets/Scripts/Inventory.cs
lock done

Signed-off-by: Otakode <marchal.cl@gmail.com>
Merge branch 'master' of https://github.com/otakode/SpaceWar
Merge branch 'master' of https://github.com/otakode/SpaceWar
Merge branch 'master' of https://github.com/otakode/SpaceWar