stuff
Merge branch 'master' of https://github.com/TyRawr/TeamWizard_Spring2014
Animations
Merge branch 'master' of https://github.com/TyRawr/TeamWizard_Spring2014
controllers
Merge branch 'master' of https://github.com/TyRawr/TeamWizard_Spring2014