Updated some stuff, I guess?

Not really sure what's happening here.
Fixing conflicts with this mystery merge.
Movement and enemy prefab
committing equipmentSim script
equipsim update
Enemy Stuffs
Merge pull request #28 from ryanadair009/master

Enemy Stuffs
Merge branch 'master' of https://github.com/dranelol/CMPS427
equipfact fixes
Merge pull request #29 from peachesandcorn/master

rand fix to equipfact
asdf
fix for equipmentfactory
Merge pull request #30 from peachesandcorn/master

fix for equipmentfactory (actual fix this time!)
HUD_GUI

Initial HUD_GUI script and assets
Merge remote-tracking branch 'upstream/master'
Merge pull request #31 from jpd5367/master

HUD_GUI
MAYBE NO MORE NULL REFERENCES
Fixed dem janky ass physics
Fixed physics
camera prefab