added bullet to the project, started intergrating the player
merge resolution