saeed kameli hastam. commit kardam
Merge branch 'master' of https://github.com/yzt/class_test2

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/yzt/class_test2

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/yzt/class_test2

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/yzt/class_test2

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/yzt/class_test2
Merge branch 'master' of https://github.com/yzt/class_test2
Merge branch 'master' of https://github.com/yzt/class_test2
sallam
Merge branch 'master' of https://github.com/yzt/class_test2
salam
Merge branch 'master' of https://github.com/yzt/class_test2