added computer and player display
merge