Fixed aspect ratio of game for use with iPad.
Fixing merge conflict.