branch static
branch static
branch static
static-page and
Merge branch 'static-pages'

Conflicts:
	README
ruby