Another commit
Merge github.com:dlssteinberg/Testing

Conflicts:
	dummy.php