stuff
blahMerge branch 'master' of https://github.com/oliverwkim/cs51-project

Conflicts:
	CS51Project/bin/AStar.class
halpMerge branch 'master' of https://github.com/oliverwkim/cs51-project

Conflicts:
	CS51Project/src/AStar.java
fixed bug with first bit