Added a SetWeapon method for pickups to use
Pickup manager.  Doesn't do spawning yet.
Merge branch 'master' of https://github.com/sposterkil/eecs290fps

Conflicts:
	Assets/PlayerAssets/PlayerManager.cs
Meta files, meta files