ffucking git
added player stuff
merge fixed