response amendements
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/custom2.css
	page.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/custom2.css
	page.php