Added comment to FRCConfig
Merge origin/master
Added comments to FRCConfig
Merge origin/master

Conflicts:
	FRC3157/src/edu/wpi/first/wpilibj/templates/OutputData.java