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

Conflicts:
	components/header/header.js