something about OSM
Merge branch 'gh-pages' of github.com:xeoinquedos/osm-slides into gh-pages

Conflicts:
	index.html