scoring somewhat updated
scoring somewhat updated
Merge origin/master

Conflicts:
	PlayerSelectsFrame.java
Merge origin/master

Conflicts:
	PlayerSelectsFrame.java