Merge commit

Change-Id: I4681c9da28cb3d409309ca80598d6a476e290d17
Signed-off-by: droy <denis.roy@eclipse.org>

.gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6798cb0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/.buildpath
+/.project

.settings/.gitignore

diff --git a/.settings/.gitignore b/.settings/.gitignore
new file mode 100644
index 0000000..1192e69
--- /dev/null
+++ b/.settings/.gitignore
@@ -0,0 +1,2 @@
+/org.eclipse.php.core.prefs
+/org.eclipse.wst.common.project.facet.core.xml