Mapped AlexCommand to button(joy1, 2)
Merge branch 'master' of https://github.com/HighlandersFRC/2014-cpp

Conflicts:
	CollaborationTest/OI.cpp
	CollaborationTest/PPC603gnu/CollaborationTest/Debug/CollaborationTest.out
	CollaborationTest/Robot.cpp
	CollaborationTest/Robot.h