Merge branch 'master' into Update
testing out the branchesss
Merge remote-tracking branch 'origin/Update' into Update

Conflicts:
	OLD PHP Files/insert.php
added folder
added conversations
Old files
inserts into database
comments
File prepping
Revert "comments"

This reverts commit 128bf5b1b5a3ccf58b7db2f362c7cd3742b003a7.
Merge remote-tracking branch 'origin/Update' into Update

Conflicts:
	site/index11.php
Merge branch 'Update' of https://github.com/Hutster/OTP into Update

Conflicts:
	site/index11.php
index name change
init commit twilio library
conifg folder
made code look like english
edit
Added validation
Form value update
confirmation text message