26.1
36.11
Merge branch 'master' of https://github.com/DavidSalzer/activistsForIsraelNew

Conflicts:
	components/article/article.css
	components/event/single-event.html
	components/meme/meme.css
	components/writePost/writePost.js
	index.html
	socialGroupApp.js