Merge branch 'master' of https://github.com/kelepirci/dash-stack

Conflicts:
	run.py

app/__init__.py

@@ -0,0 +1,5 @@
+from flask import Flask
+
+
+app = Flask(__name__)
+from app import views

app/views.py

@@ -0,0 +1,7 @@
+from app import app
+
+
+@app.route('/')
+@app.route('/index')
+def index():
+    return "Hello, dash-stack"

run.py

@@ -1,4 +1,5 @@
 #!../venv/bin/python
+<<<<<<< HEAD
 # under normal circumstances, this script would not be necessary. the
 # sample_application would have its own setup.py and be properly installed;
 # however since it is not bundled in the sdist package, we need some hacks
@@ -14,4 +15,10 @@ from dash import create_app
 # create an app instance
 app = create_app()
 
-app.run(debug=True, host='0.0.0.0', port=8000)
+app.run(debug=True, host='0.0.0.0', port=8000)
+=======
+from app import app
+
+
+app.run(debug=True, host="0.0.0.0", port=8000)
+>>>>>>> 93b030a6f6b2a025630ebe6c8af9f1de4c93a36a