Add "solve merge and rebase conflicts" place holder
Add introduction to merge and rebase article
Minor fixes in `solve-merge-and-rebase-conflicts.md`
Add merge section and screen-shots
Add rebase section to solve-merge-and-rebase-conflicts
Fix link
Minor fix in solve-merge-and-rebase-conflicts
Merge pull request #37 from andresmoschini/resolve-conflicts

Resolve conflicts in Merge and Rebase operations