Mar feature1

Committed a file to conflict for other branches.

And another file added for class php.