hand tidy
Merge pull request #32 from MayOneUs-Testing/master

Markdownification
Merge branch 'master' of https://github.com/MayOneUS/mayoneus.github.io

Conflicts:
	about-us.html
	faq.html
removed upstream
fixed mismatched tags; whitespace
Merge branch 'master' of https://github.com/idiomatic/mayoneus.github.io

Conflicts:
	_includes/main_page_structure.html
	_includes/sidebar.html