more integration..
Merge remote-tracking branch 'origin/master'

Conflicts:
	Final Project/Main.nxd
	Final Project/Main.nxj
	Final Project/bin/controller/MotorController.class
	Final Project/bin/finitestatemachine/EventHandler.class
	Final Project/bin/finitestatemachine/FiniteStateMachine.class
	Final Project/src/finitestatemachine/EventHandler.java
	Final Project/src/finitestatemachine/FiniteStateMachine.java