change the file name to example
Update from the other computer
Merge remote-tracking branch 'origin/master'