fixing merge notes

toolbox/website/__init__.py

 from flask import Flask
-<<<<<<< HEAD
-
-website = Flask(__name__)
-=======
 from flask.ext.sqlalchemy import SQLAlchemy
 from flask.ext.admin import Admin
 
 website = Flask(__name__)
 website.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////database.db'
 admin = Admin(website)
->>>>>>> dev
-from website import routes

toolbox/website/routes.py

@@ -8,30 +8,18 @@ SERVICE_URL = "http://129.174.177.239/cgi-bin/pycas.py"
 @website.route('/login')
 def my_login():
     status, id, cookie = pycas.login(CAS_SERVER, SERVICE_URL, secure=1, opt="gateway")
-<<<<<<< HEAD
-    return redirect(url_for('home'))
-=======
     return redirect(url_for('routes.home'))
 
->>>>>>> dev
 @website.route('/')
 def home():
     return render_template('index.html')
 
-<<<<<<< HEAD
-@website.route('/feature-request', method=['GET','POST'])
-=======
 @website.route('/submit', methods=['GET','POST'])
->>>>>>> dev
 def process_request():
     form = FeatureRequestForm()
     if form.validate_on_submit():
         flash('Request Successly Submitted')
-<<<<<<< HEAD
-        return redirect(url_for('home'))
-=======
         return redirect(url_for('routes.home'))
->>>>>>> dev
     return render_template('feature_request.html',title='Request Form', form=form)