Commented out anything to do with "pin"
Merge origin/master

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