Merge branch 'master' of https://github.com/NoHer0/juicysoftware

Conflicts:
	Pixel Wars/Pixel Wars/Main.cpp
Merge branch 'master' of https://github.com/lesnewsky/juicysoftware

Conflicts:
	Pixel Wars/Pixel Wars/Main.cpp
Merge branch 'master' of https://github.com/lesnewsky/juicysoftware
kolejne poprawki po NOHER0