YOOOOOO
Merge commit '644fe830e02d96304ba25939a4f3dea400a78a01' into LevelDesign

Conflicts:
	Assets/Scenes/LevelDesign2.unity
Level design Edit

Added space in some choke points

Thickened terrain colliders

New navmesh
idk lol
Merge commit '6fff084f6a4033f3f389cbd2345fa1cd72b6af0b' into LevelDesign

Conflicts:
	Assets/LevelDesignImport/New Terrain 1.asset
Worked on LevelDesign2

Added Drop Pod Model
Building placement modifications
added rock wall to water
New solid texture
Boss Fall Animation
work on #146
- Added a falling animation for the boss. Now rather than walking into the arena the boss will fall from the sky.
Indicators
- Implemented an ammo ring indicator for both shotgun and beam rifle
Indicators
- Work on reimplementation of Immunity pickup
- No longer timed and instead creates shield that lasts until destroyed by enemies
Boss Drop Using iTween
work on #146
- The animation didn't work out, so we'll use iTween to do the air drop.
Added new texture pack.

Changed grass texture for LevelDesign2 scene
Added new building textures for LevelDesignNewTextures, use this scene to preview some sample textures
Merge remote-tracking branch 'origin/master' into boss_meshes

Conflicts:
rotated directional light. literally, thats all i did
Laser and shot gun meshes are here make sure there up there
Fixed the LaserGun
Drop Points
work on #146
- You can now provide the initial state a list of potential drop points and it will pick the one closest to the player. This is done so the player can always see the boss when it drops down.
Impact Particles
work on #146
- Added a visual effect for when the boss lands. It's pretty sick.
Rotate Spider Tank
- Updated the rotation of the local spider tank mesh now that the fbx has been fixed.
Merge branch 'master' into boss_meshes

Conflicts:
	Assets/Prefabs/Bosses/Spider Tank.prefab
	Assets/Scenes/Basic Boss.unity
Merge pull request #149 from ModSquadWorkshop/boss_meshes

Boss meshes