Merge branch 'Nir'
Revert "Merge branch 'master' into Gal"

This reverts commit 5128751fcbd56128ff86ba25027244b2deb08155, reversing
changes made to ef13f187a6cd3365230db3a1439b3c346a81b591.
Merge branch 'master' of https://github.com/galgreshler/Jamstars
Merge branch 'Gal'