Adding functions
Add Gun class
GGG
.
Revert "."

This reverts commit d9e9c31c793ca8f1d64d16a9f25ccfcc5af551e0.
Fixed merge conflict

fixed merge conflict