Reverted previous edit of .gitignore
Merge branch 'master' into dev
Did networking-related changes to the config. Check commit.
Merge branch 'master' of github.com:HeavensGate/NSS-Eternal