Adds second piston
Adds second piston
Merge origin/master

Conflicts:
	src/edu/wpi/first/wpilibj/templates/Salamander.java
Adds second piston