from-web-editing.md

This is a file created from the web view

Because this file and the commit that is comming is on the web and not my machine, I will need to do a git pull.

This is an additional commit from the web to show how to deal with merge locally.