somthing wrong!
Merge branch 'master' of https://github.com/mohammadbagher/MatlabConquerors

Conflicts:
	GUI/ChapterThree/ChapterThree.fig