Revert "Merge branch 'master' of github.com:GhoulofGSG9/NS2Combat"

This reverts commit 672f25a7a252e4ee3758ee003876f8976ed3e733, reversing
changes made to 4859f4b797feae0515ee7fc32ba6899efca87e29.