dd
Merge branch 'master' of https://github.com/shaloba/Shlomy into 080914

Conflicts:
	temp.py
ffd