Master branch test.
Merge branch 'gh-pages'

Conflicts:
	index.html
fiddling
initial design
Merge pull request #1 from writethedocs/landing

Landing page, initial design