Merge branch 'Update'
Merge branch 'Update'
Merge branch 'Update'
hello comment
comment changed to thomas name
sean crowe comment
Merge remote-tracking branch 'origin/master'

Conflicts:
	OLD PHP Files/insert.php
Merge branch 'master' into Update