Merge branch 'release/v1.0'

UMM-CSci-3601 · Jan 17, 2017 · c7f6a26 · c7f6a26
2 parents 874c757 + eb9f74d
commit c7f6a26
Show file tree

Hide file tree

Showing 13 changed files with 393 additions and 127 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,26 +1,10 @@
+# We've decided to simplify things and ignore the entire `.idea` directory.
+
+.idea
+
 # 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
 

diff --git a/.idea/dictionaries/mcphee.xml b/.idea/dictionaries/mcphee.xml
diff --git a/.idea/intro-to-git.iml b/.idea/intro-to-git.iml
diff --git a/.idea/markdown-exported-files.xml b/.idea/markdown-exported-files.xml
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml