fix
Merge branch 'master' of https://github.com/NicoM1/Collab
fix ammostorage, add default names, change to trailing underscores