reworked the beginner chapters
minor revisions
putting images into directory structure
updates and revisions
bringing more tools section up to date
updates/improvement to presets chapter
converted custom presets chapter and edited for greater simplicity
edits to multipolygon section
finish relations chapter
updating imagery chapters
edits to conflict resolution
add iD editor chapter
work on export chapter
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

https://github.com/jeffhaack/learnosm

Conflicts:
	_posts/en/0200-12-22-arerial-imagery-considerations.md
	_posts/en/0200-12-23-editing-with-josm.md
	_posts/en/beginner/0200-12-20-beginner-all-chapters.html
	_posts/en/beginner/0200-12-24-papers.md
	_posts/en/beginner/0200-12-26-gps.md
	_posts/en/beginner/0200-12-28-start-josm.md
	_posts/en/beginner/0200-12-29-start-osm.md
	_posts/en/beginner/0200-12-30-introduction.md
	_posts/en/editing/0400-11-29-josm-plugins.md
	images/Homepage.png
	images/asd.png
	images/beginner/ch6-field-papers/Homepage.png
	images/beginner/ch6-field-papers/asd.png
	images/beginner/ch6-field-papers/blackandwhite.png
	images/beginner/ch6-field-papers/choosetile.png
	images/beginner/ch6-field-papers/downloadpdf.png
	images/beginner/ch6-field-papers/editinidorpot.png
	images/beginner/ch6-field-papers/fsnapshot.png
	images/beginner/ch6-field-papers/labelnext.png
	images/beginner/ch6-field-papers/layout.png
	images/beginner/ch6-field-papers/makeatlas.png
	images/beginner/ch6-field-papers/makeyourselfanatlas.png
	images/beginner/ch6-field-papers/name.png
	images/beginner/ch6-field-papers/preparingyouratlas.png
	images/beginner/ch6-field-papers/scannedmap.png
	images/beginner/ch6-field-papers/scrnsht.png
	images/beginner/ch6-field-papers/upload.png
	images/beginner/ch6-field-papers/uploadfp.png
	images/beginner/ch6-field-papers/watchsnapshot.png
	images/beginner/ch6-field-papers/zoominout.png
	images/blackandwhite.png
	images/choosetile.png
	images/downloadpdf.png
	images/editinidorpot.png
	images/en/en_beg_06_field-papers_image00_homepage.png
	images/en/en_beg_06_field-papers_image04_makeatlas.png
	images/en/en_beg_06_field-papers_image05_makeyourselfanatlas.png
	images/en/en_beg_06_field-papers_image06_zoominout.png
	images/en/en_beg_06_field-papers_image07_choosetile.png
	images/en/en_beg_06_field-papers_image08_blackandwhite.png
	images/en/en_beg_06_field-papers_image09_zoom.png
	images/en/en_beg_06_field-papers_image10_labelnext.png
	images/en/en_beg_06_field-papers_image11_name.png
	images/en/en_beg_06_field-papers_image12_layout.png
	images/en/en_beg_06_field-papers_image13_preparingyouratlas.png
	images/en/en_beg_06_field-papers_image14_downloadpdf.png
	images/en/en_beg_06_field-papers_image15_scrnsht.png
	images/en/en_beg_06_field-papers_image16_upload.png
	images/en/en_beg_06_field-papers_image17_uploadfp.png
	images/en/en_beg_06_field-papers_image18_asd.png
	images/en/en_beg_06_field-papers_image20_watchsnapshot.png
	images/en/en_beg_06_field-papers_image22_scannedmap.png
	images/en/en_beg_06_field-papers_image23_fsnapshot.png
	images/en/en_beg_06_field-papers_image24_editinidorpot.png
	images/fsnapshot.png
	images/labelnext.png
	images/layout.png
	images/makeatlas.png
	images/makeyourselfanatlas.png
	images/name.png
	images/preparingyouratlas.png
	images/scannedmap.png
	images/scrnsht.png
	images/upload.png
	images/uploadfp.png
	images/watchsnapshot.png
	images/zoominout.png