Merge pull request #1 from ParadiseSS13/master

Merge From Master
Job Changes
Hug Nerf
Merge pull request #2 from Fox-McCloud/Job-Changes

Job changes