Merge pull request #6 from PenguinEmpire/dev

Dev to master
PenguinEmpire · Mar 25, 2019 · 2a1ec73 · 2a1ec73
2 parents fd25f62 + 807e16f
commit 2a1ec73
Show file tree

Hide file tree

Showing 4 changed files with 286 additions and 146 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -16,6 +16,8 @@
   "files.associations": {
     "*.inc": "cpp",
     "string": "cpp",
-    "unordered_map": "cpp"
+    "unordered_map": "cpp",
+    "cmath": "cpp",
+    "complex": "cpp"
   }
 }