diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..81006365
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,38 @@
+# Handle line endings automatically for files detected as text
+# and leave all files detected as binary untouched.
+* text=auto
+
+#
+# The above will handle all files NOT found below
+#
+# These files are text and should be normalized (Convert crlf => lf)
+*.css           text
+*.df            text
+*.htm           text
+*.html          text
+*.java          text
+*.js            text
+*.json          text
+*.jsp           text
+*.jspf          text
+*.properties    text
+*.sh            text
+*.sql           text
+*.svg           text
+*.tld           text
+*.txt           text
+*.xml           text
+
+# These files are binary and should be left untouched
+# (binary is a macro for -text -diff)
+*.class         binary
+*.dll           binary
+*.gif           binary
+*.ico           binary
+*.jar           binary
+*.jpg           binary
+*.jpeg          binary
+*.png           binary
+*.so            binary
+*.war           binary
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..40b12a94
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,48 @@
+# Spark ignores
+/target
+
+# Java ignores
+*.class
+hs_err_pid*
+
+# Eclipse ignores
+.settings/
+.classpath
+.project
+bin/
+.loadpath
+*.launch
+
+# IntelliJ ignores
+.idea/
+*.ipr
+*.iws
+*.iml
+out/
+
+# Netbeans ignores
+nbproject/
+nbbuild/
+nbdist/
+nbactions.xml
+nb-configuration.xml
+
+# Generic ignores
+*~
+*~*
+*.lock
+*.log
+*.swp
+*.out
+*.tmp
+*.bak
+Desktop.ini
+$RECYCLE.BIN/
+Thumbs.db
+ehthumbs.db
+.DS_STORE
+._*
+.Trashes
+.Spotlight-V100
+tmp/
+