adding temp file foo
deleted foo.txt and modified testing.txt JJ1 v1->v2
Merge branch 'master' of https://github.com/eastsideweb/learn-github