6
Merge branch 'master' of https://github.com/XKC/XKC___TEST

Conflicts:
	CodeBlocks/Console application/main (used
windows.h)/Sp__test/Sp__test.depend
	CodeBlocks/Console application/main (used
windows.h)/Sp__test/Sp__test.layout
	CodeBlocks/Console application/main (used windows.h)/Sp__test/main.c