six
seven
Merge branch 'master' of
https://github.com/mohmad-asadolahi/first-project.git

Conflicts:
	gitting/MainClass.cpp