Merge branch 'dev'

Author: intendednull

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "python.pythonPath": "/home/zer0/.local/share/virtualenvs/code-jam-4-dx72tKEY/bin/python",
+    "python.linting.pylintEnabled": false,
+    "python.linting.flake8Enabled": true,
+    "python.linting.enabled": true
+}