Merge github.com:nirshub/hackita-thursdays
Nir's project
Merge remote-tracking branch 'shai/master'