Added gun object to player prefabs. Gun script handles shooting now
Merge conflict resolution