Merge branch 'master' into vince_branch
adding file3.txt
Merge branch 'vince_branch'
Merge branch 'master' of https://github.com/kelleyrw/gittest