Merge branch 'master' of https://github.com/pfitch45/AIO_website_project

Conflicts:
	send_form_email.php
wip