Working on the bullet and gun scripts
Committing for merge
Merge resolution