Feature2 - oops, forgot test.php
upodated feature2.php
upodated again
3rd update to feature2.php
Feature2 - Added a string class, the methods are stubbed and the unit
tests fail.
Feature2 - All 3 test cases now pass. Phew!
I hope this is right!!

Merge branch 'Feature2'

Conflicts:
	test.php
Merge remote-tracking branch 'origin/master' into Feature3