tst
Merge branch 'master' of https://github.com/vivacognita/initial_site

Conflicts:
	Viva Cognita Site 2.0/content.html
	Viva Cognita Site 2.0/css/content-page.css
	Viva Cognita Site 2.0/footer.php
	Viva Cognita Site 2.0/page.php
	Viva Cognita Site 2.0/style.css