old_contents: import APIFunctions
  import datetime
  from sqlalchemy import create_engine
  from sqlalchemy.orm import sessionmaker
  from Classes import Base, Trip, Station, TripRecord
  
  #TODO everything
  
  db = create_engine('sqlite:///mbta.db', echo=False)
  Base.metadata.create_all(db)
  Session = sessionmaker(bind=db)
  session = Session()
  
  
  
  <<<<<<< HEAD
  # red_stations = APIFunctions.get_stations('Red')
  # for station in red_stations:
  #     session.add(station)
  #
  # session.commit()
  
  print session.query(Classes.Station).filter(Classes.Station.name_human_readable.is_('Alewife')).first().location_lat
  =======
  red_stations = APIFunctions.get_stations('Red')
  for station in red_stations:
      session.add(station)
  >>>>>>> b708cce0564256741bca132fbefc5c64397b2c0c
  
  session.add(Trip(id=1, date=datetime.datetime.now(), origin_station_id=3, destination_station_id=4))
  
  <<<<<<< HEAD
  for trip in all_red_trips:
      print trip
  =======
  session.commit()
  >>>>>>> b708cce0564256741bca132fbefc5c64397b2c0c
  
new_contents: import APIFunctions
  import datetime
  from sqlalchemy import create_engine
  from sqlalchemy.orm import sessionmaker
  from Classes import Base, Trip, Station, TripRecord
  
  #TODO everything
  
  db = create_engine('sqlite:///mbta.db', echo=False)
  Base.metadata.create_all(db)
  Session = sessionmaker(bind=db)
  session = Session()
  
  
  
  red_stations = APIFunctions.get_stations('Red')
  for station in red_stations:
      session.add(station)
  
  session.add(Trip(id=1, date=datetime.datetime.now(), origin_station_id=3, destination_station_id=4))
  
  session.commit()
subject: fix merge conflicts