Fixed the player.c merge conflicts and made the attacking better, still need to work on it though, it is only rotating the upper arm for now just for testing purposes, but the attacking is there