Merge branch 'master' into flake8-updates

# Conflicts:
#	.flake8
#	Pipfile
#	Pipfile.lock

1 files changed, 3 insertions, 5 deletions

diff --git a/snekweb.py b/snekweb.py
index 2ed1034..f965323 100644
--- a/snekweb.py
+++ b/snekweb.py
@@ -1,13 +1,11 @@
-import traceback
-import threading
-import logging
 import json
+import logging
+import threading
+import traceback
 
 from flask import Flask
 from flask import render_template
 from flask_sockets import Sockets
-
-
 from rmq import Rmq
 
 # Load app