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