Resolving conflict
Merge branch 'master' of https://github.com/voznesenskym/gameJelly

Conflicts:
	Arrrgggg/Assets/Scripts/Lighting/LightingManager.cs
Merge branch 'master' of https://github.com/voznesenskym/gameJelly
Updated weapon for both mouse and gamepad
Merge branch 'master' of https://github.com/voznesenskym/gameJelly