Changed Kinematics
Merge branch 'master' of https://github.com/rlsanroman/RoboticsProject1

Conflicts:
	src/project1/MainWindow.java