Merge branch 'resizing' of E:\Dropbox\Google Drive\SkyDrive\PangGame with conflicts.
lives