Add cash at end of round
better boarders on button
Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/main.js
	scripts/playerState.js
merge