merge with upstream

I removed the Main_Image directories. Sorry they must have duplicated with a merge sometime today. The new folder is 360-frame-1..