Updated ManFromOrange
Merging changes done on two computers during practice today. Merge branch 'master' of https://github.com/thunderbotz/lego2013