testing with rendy
Merge branch 'gh-pages'

Conflicts:
	source/index.html.erb