Add completed features to README.md

Author: batprat

README.md

@@ -34,4 +34,9 @@ This is the list of features in this git client. There might be some features I
 11. View individual files' diff in a commit
 12. Create branches
 13. Commit and/or push to branches
-14. View stash, delete or stash changes
+14. View stash, delete or stash changes
+15. Rebase commits
+16. Merge branches
+17. Handle Rebase conflicts (show conflicts, one click mark as resolved)
+18. Handle Merge conflicts
+19. Search for SHAs