Add reward function to player.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	Bet.java