initial commit
random file
third change
this is another change i made
I really love git and git hub, I am serious
New file was added
New file 2 added
This commit is done so i can do --no-ff
This merge is necessary because i am learning different features of git

in this commit i used merge with no fast forwarding to see the results
I want merge conflicts
give me merge conflicts please
Merge branch 'feature-rebase-learning'

Conflicts:
	newfile
Merge branch 'master' of github.com:shercoder/try_git