Merge branch 'gh-pages' of github.com:hotosm/learnosm into all-chapters
clean up structure
resolve conflict
Update 0200-12-24-papers.md

Link to image of QR code changed. (This is the 3rd part of fixing issue #204).
added Field Papers video link to Field Papers post
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 pull request #218 from sylviahc/patch-3

Merging this although the whole file should be updated to Field Papers, as in the the new English version

Update 0200-12-24-papers.md
Merge branch 'issue#199' of https://github.com/jmarlena/learnosm into jmarlena-issue#199
Merge branch 'jmarlena-issue#199' into gh-pages
Merge branch 'gh-pages' of https://github.com/Nick-Tallguy/learnosm into Nick-Tallguy-gh-pages
fixed incorrect grammar; fixed broken link
Merge pull request #222 from tmaybe/patch-1

fixed incorrect grammar; fixed broken link
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