changed gitignore first step of merging all subtrees

.gitignore

@@ -2,12 +2,12 @@
 sites/*/settings*.php
 
 # Ignore paths that contain user-generated content.
-sites/*
-#sites/*/files
-#sites/*/private
+#sites/*
+sites/*/files
+sites/*/private
 
 _base_d7.tmproj
 /_materio.sublime-project
 /_materio.sublime-workspace
 /_solr.sublime-project
-/_solr.sublime-workspace
+/_solr.sublime-workspace

modules/simpletest/tests/psr_0_test/lib/Drupal/psr_0_test/Tests/Nested/NestedExampleTest.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace Drupal\psr_0_test\Tests\Nested;
-
-class NestedExampleTest extends \DrupalWebTestCase {
-
-  public static function getInfo() {
-    return array(
-      'name' => 'PSR0 example test: PSR-0 in nested subfolders.',
-      'description' => 'We want to assert that this PSR-0 test case is being discovered.',
-      'group' => 'SimpleTest',
-    );
-  }
-
-  function testArithmetics() {
-    $this->assert(1 + 1 == 2, '1 + 1 == 2');
-  }
-}