5
Merge branch 'master' of https://github.com/Hamanstone/StoneTest

Conflicts:
	main.txt