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
Ben and I fixed the eclipse launcher
Merge branch 'master' of https://github.com/FRCTeam1277/2014-Robot-Code.git
Merge branch 'master' into BenBranch
fix gitignore