Merge pull request #5 from jktestuser/master

Fixed repo after creating duplicate file and doing a rebase. Now alteing some_file.txt
Seeing what happens after pushing some_file.txt
Push should now work after resolving merge conflict for some_file.txt