working on weapon class
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Prefabs/player.prefab
	Assets/RAIN/Editor/RAINSettings.asset
	Assets/scenes/prototype.unity