actual fix from merge

toolbox/website/__init__.py

@@ -5,3 +5,4 @@ from flask.ext.admin import Admin
 website = Flask(__name__)
 website.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////database.db'
 admin = Admin(website)
+from website import routes

toolbox/website/forms.py

 from flask_wtf import Form
-<<<<<<< HEAD
 from wtforms.validators import DataRequired
 
-class FeatureReqestForm(Form):
 
-=======
 from wtforms.ext.sqlalchemy.orm import model_form
 from wtforms.validators import DataRequired
 from models import FeatureRequest
 
 FeatureRequestForm = model_form(FeatureRequest, Form)
->>>>>>> dev