readme changed by sina
Merge branch 'master' of https://github.com/hamidhero/Test

Conflicts:
	README.txt~