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

Conflicts:
	CS51Project/bin/GUIPanel.class
	CS51Project/bin/LPAstar.class
	CS51Project/src/GUIPanel.java
asdf