Joystick changes
Added new constructor
Fixed XBox and started lights
Lights and junk
Fixed some spelling
removed emulator.cfg from git
Merge remote-tracking branch 'origin/master'

Conflicts:
	2014 Robot/src/team1277/org/robot/MainRobot.java