misc
Merge branch 'master' of https://github.com/Jonearley/AgreeableTerms

Conflicts:
	index.php
	styles/main.css