Changed attackRating - work in progress
Merge remote-tracking branch 'origin/master'

Conflicts:
	Character.java
	Justice.java