Merge branch 'master' into Jon-Antolin
Merge branch 'master' into Aaron-Flores
Merge branch 'master' into Jared-Johnson
Merge branch 'master' into Joseph-Allison
Merge branch 'master' into Marques-Stone
Merge branch 'master' into Parker
Merge branch 'master' into Ryan-Haglund
Implemented a little bit more of the perlin noise
Major overhaul
Force Merge
adding a bit more function to the world gen
Merge branch 'Ryan-Haglund' of https://github.com/Jetblacktsunami/CSE455-Salvage into Ryan-Haglund
Merge branch 'DJ-Balane' into Ryan-Haglund
Committing changes

test
Preliminary player information file

First run of player info. ShipInfo.cs will contain the stats for the
ships and set them as necessary when chosen at base.
Player information fix

Minor error in code fixed
finished volume control scripts
volume controls fixed
healthbar for ship commit

i have the start for the healthbar part of the ui it doesn't compile yet
because of a few syntac errors that im trying to figure out.
committing update