Merge branch 'master' of github.com:nagn/Gang-Garrison-2
Fixed typo
Merge branch 'newctf' into beta4
Updated to new version