Merge branch 'gh-pages' of http://github.com/techsailor/WebsiteOne into gh-pages

Conflicts:
	test.md