Merge branch 'gh-pages' of github.com:hotosm/learnosm into all-chapters
clean up structure
resolve conflict
TM2 updates for learnOSM - 1st stage feedback welcome
Updating files & image resizing
Updating text and modifiying images to fall within size bounds
Updating text & images
Updated text file
Merge branch 'gh-pages' of https://github.com/Nick-Tallguy/learnosm into Nick-Tallguy-gh-pages
Merge remote-tracking branch 'upstream/all-chapters' into gh-pages

Conflicts:
	_layouts/doc.html
renamed draft file
Updating text in Tasking Manager document
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
Updating text within document
amending doc.html - attempting to clear {% endif %} problem - found duplicate line and deleted it.
amending doc.html attempting to clear fault - have commented out endfor tag as was not recognised. Updated tasking manager document.
further amending doc.html in attempt to clear layouts fault
another try at clearing page reading fault from github
Revert "amending doc.html - attempting to clear {% endif %} problem - found duplicate line and deleted it."

This reverts commit e6f0f97b590936f86eddefc82b15cdf7f5f1e7e8.

Conflicts:
	_layouts/doc.html
Updating text & screenshot in Tasking Manager section