Finish static pages
Merge branch 'tmp1'

Conflicts:
	README.md