changed default values
Merge branch 'master' of https://github.com/oliverwkim/cs51-project
hello
Merge branch 'master' of https://github.com/oliverwkim/cs51-project
Merge branch 'master' of https://github.com/oliverwkim/cs51-project

Conflicts:
	CS51Project/bin/ControlPanel$1.class
	CS51Project/bin/ControlPanel$2.class
	CS51Project/bin/ControlPanel$3.class
	CS51Project/bin/ControlPanel.class
Merge branch 'master' of https://github.com/oliverwkim/cs51-project
removed a line
Merge branch 'master' of https://github.com/oliverwkim/cs51-project

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