diff --git a/config/gitignore b/config/gitignore
new file mode 100644
index 0000000..c4bb196
--- /dev/null
+++ b/config/gitignore
@@ -0,0 +1,13 @@
+
+# Compressed files
+*.gz
+*.zip
+
+# Java
+*.jar
+*.class
+
+# C
+*.o
+a.out
+
diff --git a/gitconfig b/gitconfig
index 7091eec..5b27330 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,7 +1,11 @@
 [user]
-	name = Felix Van der Jeugt
 	email = felix.vanderjeugt@gmail.com
-[push]
-	default = simple
+	name = Felix Van der Jeugt
 [pull]
 	rebase = true
+[merge]
+	conflictstyle = diff3
+[push]
+	default = simple
+[core]
+	excludesfile = ~/.config/gitignore