Merge branch 'master' into box2d
Fixed the master merge conflicts

Compiled and every thing works
Added the box2d working version
SetColor now works
Allows me to change the friction values
A working version of the color changing goal game
Updated the recent changes
Working version of the spectrum game
Merge branch 'box2d'
Removed some debug, and not loading the image anymore so not a good idea
to include this
Merge branch 'box2d'