gui - update
Merge branch 'master' of https://github.com/choihy/SADI-Assignment1

Conflicts:
	bin/GUI.class
	bin/Player.class
	src/Player.java