Merge origin/master

week 11
created TokenException and then connected it to the errors in OptionsMenuControl and Scoreboard class.