Initial commit
added foo.php
Merge remote-tracking branch 'original/2.1'

Conflicts:
	README.md