ממים-צור מם
Merge branch 'master' of https://github.com/DavidSalzer/activistsForISraelNew

Conflicts:
	components/meme/write-meme.js
	components/meme/writeMeme.html