fixed conflicts w/Robot.java
Merge branch 'master' of https://github.com/corbinmc96/checkers_bot

Conflicts:
	classes/Robot.java