Iss3

merging the view finder files.