Modified git-exercise
Comparison for rebase and merge
Merge branch 'feature1'

Conflicts:
	README
comapring merge and rebase for master
Still Rebasing
still struggling
still struggling
rebase
commit so that master can be rebase