old_contents: import os
  from flask import Flask
  from flask_sqlalchemy import SQLAlchemy
  from flask_bcrypt import Bcrypt
  from flask_mail import Mail, Message
  
  
  <<<<<<< HEAD
  app = Flask(__name__)
  
  #load the default settings first
  app.config.from_pyfile("../config/config.py")
  #load the secrets
  app.config.from_envvar('APP_CONFIG_FILE')
  
  db = SQLAlchemy(app)
  
  mail=Mail(app)
  
  import globe.models
  
  print db
  
  =======
  app = Flask(__globe__)
  
  #load the default settings
  app.config.from_pyfile("../config/secrets.py")
  
  
  
  db = SQLAlchemy(app)
  mail = Mail(app)
  
  print db
  
  import globe.models
  >>>>>>> master
  import globe.views
  
new_contents: import os
  from flask import Flask
  from flask_sqlalchemy import SQLAlchemy
  from flask_bcrypt import Bcrypt
  from flask_mail import Mail, Message
  
  
  app = Flask(__name__)
  
  #load the default settings
  app.config.from_pyfile("../config/config.py")
  
  
  
  db = SQLAlchemy(app)
  mail = Mail(app)
  
  print db
  
  import globe.models
  import globe.views
  
subject: fix merge text