sync
Merge branch 'master' of github.com:dhagan/dhagan.github.io

Conflicts:
	Javascript-GPX-track-viewer/app/css/style.css
	Javascript-GPX-track-viewer/app/index.html
	Javascript-GPX-track-viewer/app/js/gpxtools/gpxtools.js
	Javascript-GPX-track-viewer/app/js/gpxtools/profilevis.js
	Javascript-GPX-track-viewer/app/js/script.js