macbook: wont let me pull becuase of a change i did to displayer controller, dont remember what i did there.
db modified, extractor class modified, displayer.controller.php unmerged