commit on t1
delete junk file on branch t1
.
more clean up on t2
more clean up again
Merge branch 'master' into t1, working on t1 after working on t2
no junk