Modified setOpponent()
Merge origin/master
Merging
Merging nr2