Replace screen-shots, add illustration and captions

- Replace screen-shots with larger ones
- Add .gif for merge-conflict plugin for Atom editor
- Minor edits in text
- Add captions for images