behind
Merge branch 'master' of https://github.com/oliverwkim/cs51-project

Conflicts:
	CS51Project/bin/AStar.class
	CS51Project/src/AStar.java
test
Merge branch 'master' of https://github.com/oliverwkim/cs51-project