ad new file k1
Merge branch 'kineret' of https://github.com/elyondekoven/testing into kineret
Merge branch 'kineret' into elyon
conflict