add player and engine
merge conflict resolved