Commit in order to pull

I want to pull to my cpu at work.
conflict

conflict
Token Indicator Duplication

Fixed what seems a part of the token duplcation issue.
Game works

Game seems stable fixed the indicator token