From 306f36d6494c7a1d176b389d7622a0c7b1cc5d44 Mon Sep 17 00:00:00 2001
From: Ryan <ryan@andthensome.nl>
Date: Thu, 12 Jan 2017 11:32:42 +0100
Subject: [PATCH] Added global gitignore

---
 git/.gitconfig        |  1 +
 git/.gitignore_global | 55 +++++++++++++++++++++++++++++++++++++++++++
 oh-my-zsh/.oh-my-zsh  |  2 +-
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 git/.gitignore_global

diff --git a/git/.gitconfig b/git/.gitconfig
index 89250ee..fe25a53 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -4,6 +4,7 @@
 
 [core]
     editor = vim
+	excludesfile = ~/.gitignore_global
 
 [push]
     default = matching
diff --git a/git/.gitignore_global b/git/.gitignore_global
new file mode 100644
index 0000000..aa0f441
--- /dev/null
+++ b/git/.gitignore_global
@@ -0,0 +1,55 @@
+# Created by https://www.gitignore.io/api/phpstorm
+
+### PhpStorm ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/workspace.xml
+.idea/tasks.xml
+
+# Sensitive or high-churn files:
+.idea/dataSources/
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/dataSources.local.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+
+# Gradle:
+.idea/gradle.xml
+.idea/libraries
+
+# Mongo Explorer plugin:
+.idea/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### PhpStorm Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# End of https://www.gitignore.io/api/phpstorm
diff --git a/oh-my-zsh/.oh-my-zsh b/oh-my-zsh/.oh-my-zsh
index ff5629e..97c0384 160000
--- a/oh-my-zsh/.oh-my-zsh
+++ b/oh-my-zsh/.oh-my-zsh
@@ -1 +1 @@
-Subproject commit ff5629e60b815b3c21ef216d5ba5943932589758
+Subproject commit 97c03841691021f916c46b2fd2d089d7970400aa