Hello World
Merge pull request #14 from FRCTeam1277/Travis'-Branch

Hello World
removed emulator.cfg from git
Merge remote-tracking branch 'origin/master'

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