Reverted previous edit of .gitignore
Merge branch 'master' into dev
Merge branch 'dev' of github.com:HeavensGate/NSS-Eternal into dev