sss
Merge branch 'master' of https://github.com/JustDoDo/JDD

Conflicts:
	readme.txt
ddd