receiving joonho's changes
Merge branch 'master' of https://github.com/skim770/cs4400

Conflicts:
	bin/Panels/MenuPanel$ButtonListener.class
pushing what I have so far