MainPilot
Merge branch 'master' of https://github.com/XibrenX/RobotProjectC

Conflicts:
	src/Controllers/MainPilot.java
Merge branch 'master' of https://github.com/XibrenX/RobotProjectC