finished the gun and reloading system for #28
all weapon prefabs with a Gun script attached to them have additional data that can be provided such as ammo per clip, reload speed, etc
Minor edits to the Ammunition & Reloading system to account for the code review comments.
"Clips" changed to "Magazines"
Merge remote-tracking branch 'origin/master' into gun_ammo_and_reloading_system_#28

Conflicts:
	Assets/LevelDesignImport/New Terrain 1.asset
	Assets/LevelDesignImport/New Terrain.asset
	Assets/Scenes/BasicBoss.unity
	Assets/Scripts/BossBehaviors/SpiderTank.cs
	Assets/Scripts/CameraFollow.cs
	Assets/Scripts/Effects/ShrapnelEffect.cs
Merge remote-tracking branch 'origin/master' into gun_ammo_and_reloading_system_#28

Conflicts:
	Assets/Scripts/EnemySpawner.cs
	Assets/Scripts/WeaponSystem.cs
Merge pull request #33 from ModSquadWorkshop/gun_ammo_and_reloading_system_#28

finished the gun and reloading system for #28