Macro updates.
Merge branch 'master' of https://github.com/irs1318dev/irs1318_2014

Conflicts:
	irs1318_2014_robot/src/irs2014/generalData/EncoderState.java