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

Conflicts:
	CS51Project/bin/GUIPanel$1.class
	CS51Project/bin/GUIPanel.class