Merge branch 'master' of github.com:willhamlam/git
merge commit
Merge branch 'master' of github.com:willhamlam/git
merge folder