Merge branch 'master' of https://github.com/Sudoka/Kingdom
changin main
Merge branch 'master' of https://github.com/Sudoka/Kingdom
here's some more
Merge branch 'master' of https://github.com/Coder356/Kingdom

Conflicts:
	main.cpp