Nolan tested with the new electronics board and spike.  I don't know what he did exactly.  I am resolving pull complications.
Nolan was testing.  I am fixing pull problems.
Merge branch 'master' of https://github.com/discobots2587/disco-frc

Conflicts:
	2014-AerialAssist/AerialAssist/src/org/discobots/aerialassist/commands/CommandBase.java