initial checkin
renamed index.html to sailboat.html
Merge branch 'master' into gh-pages

Conflicts:
	index.html