Liran's file
Merge branch 'master' of https://github.com/telavivmakers/git-workshop