Merge branch 'Test-branch'

Conflicts:
.DS_Store
octocat.txt