commit before merge
commit before merge
green and red line photo functions
commented out some lines because there was no timeline class and it wouldnt build