fixed scores
Merge branch 'master' of https://github.com/EyeWumbo/5Dev

Conflicts:
	src/state/EndState.java
	src/state/LoginState.java