Inventory changes
Inventory changes
Merge branch 'master' of https://github.com/lionelandrew/SocialplaySpaceshooter2D

Conflicts:
	SpaceShooter2D/Assets/myScenes/Done_Main.unity