Merge branch 'evaluation' into Parker
Merge branch 'evaluation' into Ryan-Haglund
Merge branch 'evaluation' into Parker
Merge branch 'evaluation' into Ryan-Haglund
Merge branch 'evaluation'
committing more changes to the world gen

also added a player prefab and i am going to be over-viewing the rest of
the art assets
moving files over to their respective directories
Committing new ui stuff
Merge branch 'Parker'
fixed the loading and unloading of assets

also fixed a threading issue that was not apparent on the windows
client that popped up in the mac client, due to accessing namespaces in
static global scope.
Music

I tried coding some objects. Im not sure if i did it the right way, but
i just made the majority of them play on load in a loop. I also included
the music I tried to use for each object, their names are self
explanatory.
update
update2
Merge branch 'Ryan-Haglund' of https://github.com/Jetblacktsunami/CSE455-Salvage into Ryan-Haglund
Merge branch 'Ryan-Haglund' into evaluation
Merge branch 'master' into Parker
Conflicts:
	CSE455-Salvage.userprefs