stuff
Merge pull request #5 from SharmaNikhil/master

Rigid
Merge pull request #6 from AlexMaxseiner/master

stuff
Nikhil was wrong!
Merge branch 'master' of https://github.com/JeffTolbert/FTC-Team4592-2012
Added IR in mux but still needs correcting for task. make sure to call starttask(updateIRVals);