Merge branch 'resizing' of C:\Users\Pawel\Documents\GitHub\PangGame with conflicts.
Merge remote-tracking branch 'origin/resizing' into resizing

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/resizing' into resizing

Conflicts:
	.idea/workspace.xml
skok