test2
Merge branch 'master' of https://github.com/HS-AMR-8-2014/Parking_Robot

Conflicts:
	bin/parkingRobot/hsamr0/ControlRST.class