fix mapping out of boundary
Merge branch 'master' into feifan

Conflicts:
	Explore/src/aStar/exploreMap.java
change number of obstacles we mark