test reStructured Text
Merge branch 'master' into gh-pages

Conflicts:
	src/pages/About.rst
Pubish