no message
jakiś merge
Merge branch 'master' of https://github.com/prawdziwy-sok/SatanicHamster into HEAD
wprowadzono detekcje kolizji
vedverv
ascsdcscsc
no message
no message
no message
no message
Merge branch 'wBiurze' of https://github.com/prawdziwy-sok/SatanicHamster

Conflicts:
	theGame/Thumbs.db
	theGame/theGame.v12.suo
	theGame/theGame/bin/Release/theGame.exe
	theGame/theGame/bin/Release/theGame.pdb
	theGame/theGame/obj/Release/theGame.exe
	theGame/theGame/obj/Release/theGame.pdb