Testing Branch Merges

Yep!...
Merge branch 'HTMLTest' into PHPTest

Conflicts:
	README
Blank out other branch
Blank out other branch