test getPoint
add getPickups v_end
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/RoboMobo/Map.java
Fix merge.