גדדג
דגדג
כגכ
Merge branch 'master' of https://github.com/DavidSalzer/110-app
דדג
Merge branch 'master' of https://github.com/DavidSalzer/110-app

Conflicts:
	css/style.css
	index.html