fixed some of the bugs with fires that were causing null references
Merge branch 'master' of https://github.com/Logibeara/coms437battleship

Conflicts:
	Assets/Scripts/Stations/GunStation.cs