Merge branch 'gh-pages'
Refactor to change surface in a global variable
Added method getWidth and getHeight to Sprite
Added a pixelColision method to Sprite class
Merge branch 'master' into gh-pages