Updates to the Weapon system and GUI
added lights to the room map
Actually updated weapon values this time, also changed frequency property to cooldown property (faster than a division, more intuitive to me too)
Actually updated values (for real)
Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2

Conflicts:
	Assets/3D Models/Levels/Materials.meta
	Assets/TestProject/Scenes/Ship.unity
Added TeamHandler
Merge remote-tracking branch 'origin/alex2'
Fix the teamhandler
Merge branch 'odkken2'

Conflicts:
	Assets/TestProject/Prefabes/Weapons/Bullets/Shotgun Bullet.prefab
	Assets/TestProject/Prefabes/Weapons/WeaponContainer.prefab
	Assets/TestProject/Scenes/Ship.unity
	Assets/TestProject/Scripts/GUI/Enemies.meta
	Assets/TestProject/Scripts/Weapons/Bullets/BulletBase.cs
	Assets/TestProject/Scripts/Weapons/WeaponBase.cs

Made camera better.
Player is now a prefab shared by Ship and Plains levels
Uploaded lvl_testarea1 and some weapon prefabs.
Merge branch 'master' into alex2
Added TeamHandler to player and enemies
added some bullet effects
player model
Added pickupable base + health item
Added basic door + animation
Fixed in-scene weapons.  (change stuff through the WeaponContainer.prefab you goobers)

Made energy regen continous.
added laser pointer
laser pointer -fixed
Added player.meta file