Added all files for working bootstrap launching SimpleTest test run and reporter
Correct bootstrap.php conflict due to branch switch

Conflicts:
	bootstrap.php