resolution changes
fixed merge conflicts
fixed merge conflicts, updated resolution, added fullscreen
Merge pull request #28 from red-admirals-2014/fullscreen

Fullscreen