zxc
Merge branch 'master' of https://github.com/DavidSalzer/110-app
df
Merge branch 'master' of https://github.com/DavidSalzer/110-app

Conflicts:
	_notes/dwsync.xml
	css/_notes/dwsync.xml
	img/_notes/dwsync.xml
	js/_notes/dwsync.xml
Merge branch 'master' of https://github.com/DavidSalzer/110-app
אורדר
Merge branch 'master' of https://github.com/DavidSalzer/110-app