changes to player
gitignore
merge conflict, changed game, made player scroe