Fixed some broken physics
Merged
I apparently deleted a copy of the shield.

except I didn't. But the original still seems to be there!
Merge branch 'master' of https://github.com/BTHAgileProject2014/BO360