mering
merging
Merge branch 'master' of
https://github.com/SteveLovesPudding/ML_FinalProject.git

Conflicts:
	src/robotArm/Arm.java
Merge branch 'master' of https://github.com/SteveLovesPudding/ML_FinalProject.git
Data generator,  prelim data txt file with 1 arm, 100 iterations