minor modifications
Behavior works completely :)

there was a weird error that wouldn’t let me merge properly. Hopefully
no files were changed
Merge branch 'master' of https://github.com/techcat/BS-Ida_Madina_pd9

Conflicts:
	Player.java
	Setting.java