Create gh-pages branch via GitHub
Merge branch 'master' into gh-pages

Conflicts:
	index.html
re-adding index
removed right margin from <aside> elem
Fixed position of waves-y so as not to created a right border on the edge of the page.
tweaked boat size for desktop
added in other vendor prefixes
reducing text
adding back index.html