new file to test
edit test_ing.txt on mac
second modified test_ing
rebase
changed the Gemfile
third time	modified:   Gemfile
third
fourth time
five time
six time
seven time
rebase test
ubuntu change
naming
pull testing
rebase testing