edited
Merge branch 'master' of https://github.com/junkimarui/mazeSimulator.git

Conflicts:
	src/problemSet1/Robot.java