first commit in terminal
Merge branch 'master' of https://github.com/timfoil/test-repo
trying to merge

need to merge to pull from github...