updated test.htm for a test
updated php again
trying commit and push from 'Git Staging' view
Merge branch 'master' of https://github.com/markjanstice/Test

Conflicts:
	Test.htm