Just want to add my line. I did it..
another line
done
Merge branch 'master' of github.com:pratgithub/jr0cket-git-workshop

Conflicts:
	index.md