game wip
Merge branch 'master' into game
game up
merges
Merge branch 'master' into game
add scope and tensor