add gitrebase task
added readme docs for gitrebase
changing --theirs default to  in git rebase
Merge branch 'pr/14'