Updating README with description of Windows installer
Merge pull request #572 from gvwilson/adding-note-about-windows-installer

Updating README with description of Windows installer
Corrected the order of the images in the Git Conflicts section.
Merge pull request #574 from ctjacobs/fix-order-of-git-conflicts-images

Fix image order in novice/git/03-conflict.md