intentionally adding file already on origin/master
removed jk.txt to fix repo
Merge branch 'master' of https://github.com/jktestuser/Git-Test-Drive
Modifing some_file.txt
Merge pull request #5 from jktestuser/master

Fixed repo after creating duplicate file and doing a rebase. Now alteing some_file.txt